From f1df33ab09fb0a8d2a37e0049937c79ede6fbb7b Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Thu, 21 Sep 2017 15:51:17 -0400 Subject: [PATCH] Update qa patch --- games-emulation/higan/Manifest | 2 +- .../higan/files/higan-104-QA.patch | 43 ++++++++----------- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest index ec7fa89..7960caa 100644 --- a/games-emulation/higan/Manifest +++ b/games-emulation/higan/Manifest @@ -1,4 +1,4 @@ -AUX higan-104-QA.patch 2597 SHA256 6add96752eb7388fb7ef0ca0db47439caf2b90c8055305fbf36acaeaa814bc2e SHA512 421584e9c26ae66117b5f4d95a7afb3b21674fd112ca33fca7cb0c33e7382f8dda100900536eab3f413a6a3cf0f98cc079644b8cee309f17f50c1bd99604728e WHIRLPOOL e7ce4aa4b573fb0cd5ca836d3f353633607670715c31b2e6d2de6c9b97a6eddf20a38402e30d8270705cb33597fdfab1a556f0a74808a0017247c746329d4aed +AUX higan-104-QA.patch 2537 SHA256 2530058253ab7f01ed97fe61bec1d02ae8f4dc64bd1ad05944271740ac1786fe SHA512 5c9304191a745cf7a541df3ffd221573aa03e1ff03d457eed9f76b464360bcee0dac767e79ca2e355020f68cae7a7ad42e22f12814623c110311e0392e6b714c WHIRLPOOL b59173f34d4b1571494c4a3b5e2ff761d26df11478d9676f74e3f3b9f13d076a8d8edb5da39fcc6e72cb144a2c69f7e70d8d58db20fc2dee4e3e4b48954f185d AUX higan-wrapper 124 SHA256 a2640df99434ad820ead4015e071681b05ddd10a44eaed9571d7a28bba4b8def SHA512 af3163d06f3bc14b14ec38cf84d11cc706eb6359727743eea35670b4f1ac120af40102ee5409695eba00ead70fcf964073c24d2f47d6824776391927ebbf3f45 WHIRLPOOL 74e4a9232668dc61c300a49fbe05d654313a5867946497e1e95c46d9d4140634d0eb74eef8969fad5ab38b0d635069698a7e635058809ed2bf8792e89401c81d DIST higan_v104-source.7z 922223 SHA256 342400ba494b37a95210f11e6d941566e50a772095586406c14d75293f525544 SHA512 acb53f53ab79558d65eaba2aacbf42eaeae7fd4d831a8ef7c96c8b77c1bd67571ea480764f9cb8b376d5c02f380d4a835b44decbd4cece420329c14ef86909f8 WHIRLPOOL 9c6ae66a739f6a5e1f31786efd54fc445cfc78aa92556a99007cc503fda160ec778d26a8b881494f0fe263d05d8555774ca72a83799f2f12438fea6c163e0529 EBUILD higan-104.ebuild 3321 SHA256 f71305983e895ea8dc68fa130c62e8d5f346d0ad2f5c1ebdb7d97237571df547 SHA512 826e888abda2b7f5340277b0b6d2b470b553449cf36a1e7ff748b559df0ad69079ebff49770155529b8c314429d43ec15a03f3be69c599f407fa9782ddb270ca WHIRLPOOL fde570c54a4ca436c3b0ed05bbac7374c05247fec4c393c4f28ff6b1408e15056454805f7fa9e83b78dfbcbdea7b44065da96cd2c5175b04023ce9af0ddb272c diff --git a/games-emulation/higan/files/higan-104-QA.patch b/games-emulation/higan/files/higan-104-QA.patch index fd4eb13..ebe3dfb 100644 --- a/games-emulation/higan/files/higan-104-QA.patch +++ b/games-emulation/higan/files/higan-104-QA.patch @@ -1,16 +1,7 @@ diff -Naur a/higan/GNUmakefile b/higan/GNUmakefile ---- a/higan/GNUmakefile 2016-06-17 18:56:06.414883957 +0200 -+++ b/higan/GNUmakefile 2016-06-17 18:56:19.075903050 +0200 -@@ -4,7 +4,7 @@ - # target := loki - # console := true - --flags += -I. -I.. -O3 -+flags += -I. -I.. - objects := libco audio video resource - - # profile-guided optimization mode -@@ -31,7 +31,7 @@ +--- a/higan/GNUmakefile 2017-08-11 06:03:07.000000000 -0400 ++++ b/higan/GNUmakefile 2017-09-21 15:45:07.561964734 -0400 +@@ -19,7 +19,7 @@ else ifeq ($(platform),macosx) flags += -march=native else ifneq ($(filter $(platform),linux bsd),) @@ -19,7 +10,7 @@ diff -Naur a/higan/GNUmakefile b/higan/GNUmakefile link += -fopenmp link += -Wl,-export-dynamic link += -lX11 -lXext -@@ -42,9 +42,9 @@ +@@ -30,9 +30,9 @@ compile = \ $(strip \ $(if $(filter %.c,$<), \ @@ -31,10 +22,10 @@ diff -Naur a/higan/GNUmakefile b/higan/GNUmakefile ) \ ) \ ) - ---- a/higan/target-tomoko/GNUmakefile 2016-06-17 19:10:27.729182818 +0200 -+++ b/higan/target-tomoko/GNUmakefile 2016-06-17 19:14:34.034554246 +0200 -@@ -45,10 +45,10 @@ +diff -Naur a/higan/target-tomoko/GNUmakefile b/higan/target-tomoko/GNUmakefile +--- a/higan/target-tomoko/GNUmakefile 2017-07-28 03:41:22.000000000 -0400 ++++ b/higan/target-tomoko/GNUmakefile 2017-09-21 15:46:18.861960790 -0400 +@@ -48,10 +48,10 @@ objects := $(patsubst %,obj/%.o,$(objects)) obj/ruby.o: ../ruby/ruby.cpp $(call rwildcard,../ruby/) @@ -47,7 +38,7 @@ diff -Naur a/higan/GNUmakefile b/higan/GNUmakefile obj/ui-tomoko.o: $(ui)/tomoko.cpp $(call rwildcard,$(ui)/) obj/ui-program.o: $(ui)/program/program.cpp $(call rwildcard,$(ui)/) -@@ -64,7 +64,7 @@ +@@ -67,7 +67,7 @@ # targets build: $(objects) @@ -56,24 +47,24 @@ diff -Naur a/higan/GNUmakefile b/higan/GNUmakefile ifeq ($(platform),macosx) @if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi mkdir -p out/$(name).app/Contents/MacOS/ - ---- a/icarus/GNUmakefile 2016-07-05 16:42:09.198091772 +0200 -+++ b/icarus/GNUmakefile 2016-07-05 16:48:14.388351427 +0200 -@@ -2,7 +2,7 @@ +diff -Naur a/icarus/GNUmakefile b/icarus/GNUmakefile +--- a/icarus/GNUmakefile 2017-07-30 03:32:34.000000000 -0400 ++++ b/icarus/GNUmakefile 2017-09-21 15:48:41.750952887 -0400 +@@ -3,7 +3,7 @@ include ../hiro/GNUmakefile name := icarus --flags += -I.. -O3 +-flags += -I.. +flags += -I.. $(CXXFLAGS) link += ifeq ($(platform),windows) -@@ -14,7 +14,7 @@ +@@ -15,7 +15,7 @@ objects += $(if $(call streq,$(platform),windows),obj/resource.o) all: $(objects) -- $(call unique,$(compiler) -o out/$(name) $(objects) $(link) $(hirolink)) -+ $(call unique,$(compiler) -o out/$(name) $(objects) $(link) $(hirolink) $(LDFLAGS)) +- $(strip $(compiler) -o out/$(name) $(objects) $(link) $(hirolink)) ++ $(strip $(compiler) -o out/$(name) $(objects) $(link) $(hirolink) $(LDFLAGS)) ifeq ($(platform),macosx) @if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi mkdir -p out/$(name).app/Contents/MacOS/