Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/files/, ...
Date: Mon, 30 Sep 2019 22:10:53
Message-Id: 1569881382.dd5d473e63ad1c696ebde0622e92b739b4d05489.chewi@gentoo
commit:     dd5d473e63ad1c696ebde0622e92b739b4d05489
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 22:09:42 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Sep 30 22:09:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd5d473e

app-emulation/gallium-nine-standalone: Bump to 0.5

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 app-emulation/gallium-nine-standalone/Manifest     |  1 +
 .../gallium-nine-standalone/files/0.5-flags.patch  | 28 ++++++++++++++++++++++
 ...9.ebuild => gallium-nine-standalone-0.5.ebuild} |  2 +-
 .../gallium-nine-standalone-9999.ebuild            |  2 +-
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest
index 3d4616309b7..72d80c4764e 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -1,2 +1,3 @@
 DIST gallium-nine-standalone-0.3.tar.gz 63887 BLAKE2B bd198617a5d3d3830bd5127b63eed2c82bff037141ae72ff9237ad5062fdbe9b6797e233eaf86e06d92153487c53389eb094b0be3b0cbdbf3fe565292a15cbb0 SHA512 80fedca58523fbf318109d2d3d5420e97d26ebf5b89b9f1965165c7a33c9dab9c62a65f14b75569b5126c549f5df91beef372d54e94dc90c608932eeb6a59829
 DIST gallium-nine-standalone-0.4.tar.gz 66820 BLAKE2B 7e7b0028f0c7e7c26fa1ee164e7e867fee39a5f315b750bfc3537e8720e9fbc625ca27fb28a58e8e521af455f8ab347d6fd6ca82786fe5ac9d76e368cd43466e SHA512 6af31e828400c6f711c76d91fb65215f4ba79c31b8d98f3e953b319593d96d1e5e78e07aca96529de37bbb89f3479a4d4db5f58e32ce7b98667284be10a9e532
+DIST gallium-nine-standalone-0.5.tar.gz 69056 BLAKE2B 6acfd500a31e480e2e09e751097beaa2bc94c574edd2b313adb707dc65447be1868ed190bf13549cc38eae945d421242a5d3b2c068486ad35347903e27e0bf80 SHA512 6223a851536c67d32e3a834d7a3c7b93fb59c226b127e1ee1b5a72a7cc93172173f5004ca4944a842015650ef80e8427a684109ae5a4a9e9ef838961e0767c78

diff --git a/app-emulation/gallium-nine-standalone/files/0.5-flags.patch b/app-emulation/gallium-nine-standalone/files/0.5-flags.patch
new file mode 100644
index 00000000000..7c0e883d697
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/files/0.5-flags.patch
@@ -0,0 +1,28 @@
+diff -Naur a/tools/cross-wine32.in b/tools/cross-wine32.in
+--- a/tools/cross-wine32.in	2019-09-25 13:25:24.000000000 +0100
++++ b/tools/cross-wine32.in	2019-09-30 23:05:00.121344967 +0100
+@@ -5,8 +5,8 @@
+ pkgconfig = '@PKG_CONFIG@'
+ 
+ [properties]
+-c_args = ['-m32']
+-c_link_args = ['-m32', '-mwindows']
++c_args = @CFLAGS@ + ['-m32']
++c_link_args = @LDFLAGS@ + ['-m32', '-mwindows']
+ needs_exe_wrapper = true
+ 
+ [host_machine]
+diff -Naur a/tools/cross-wine64.in b/tools/cross-wine64.in
+--- a/tools/cross-wine64.in	2019-09-25 13:25:24.000000000 +0100
++++ b/tools/cross-wine64.in	2019-09-30 23:04:57.340283350 +0100
+@@ -5,8 +5,8 @@
+ pkgconfig = '@PKG_CONFIG@'
+ 
+ [properties]
+-c_args = ['-m64']
+-c_link_args = ['-m64', '-mwindows']
++c_args = @CFLAGS@ + ['-m64']
++c_link_args = @LDFLAGS@ + ['-m64', '-mwindows']
+ needs_exe_wrapper = true
+ 
+ [host_machine]

diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild
similarity index 98%
copy from app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
copy to app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild
index 3c025087d82..1358e3c9e1c 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild
@@ -38,7 +38,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/flags.patch
+	"${FILESDIR}"/0.5-flags.patch
 	"${FILESDIR}"/0.3-nine-dll-path.patch
 )
 

diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
index 3c025087d82..1358e3c9e1c 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@@ -38,7 +38,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/flags.patch
+	"${FILESDIR}"/0.5-flags.patch
 	"${FILESDIR}"/0.3-nine-dll-path.patch
 )