commit: f58eaa2919416ba78ceb2da7e57e0a51e5fd1728
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 24 10:32:20 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 10:32:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f58eaa29
app-emulation/gallium-nine-standalone: Version bump to 0.8
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
app-emulation/gallium-nine-standalone/Manifest | 1 +
.../files/0.8-cross-files.patch | 32 ++++++++++++++++++++++
...9.ebuild => gallium-nine-standalone-0.8.ebuild} | 2 +-
.../gallium-nine-standalone-9999.ebuild | 2 +-
4 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/app-emulation/gallium-nine-standalone/Manifest
b/app-emulation/gallium-nine-standalone/Manifest
index 071df4f33d3..9d0095b1d5a 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -1 +1,2 @@
DIST gallium-nine-standalone-0.7.tar.gz 67699 BLAKE2B
85520de46e0e821f63d89691e322c3001ae853a0058a5077b484da6a1596a7ed03d2e2b7dc2686661fd21d34b33e10f4549437ce5790f18e1e6cc77c894e9d1e
SHA512
9007564347bb6677f3d4eff83f744d39487c09b543489f02dcf7606917ecd9b72decf8176d9daecb6039b8998e97f737d9f7a71a5052f4d5c73f2e99e92af43c
+DIST gallium-nine-standalone-0.8.tar.gz 66656 BLAKE2B
5eaebcc514570dbaff44c4c889025d19a26c0b54941d1ab99ec131216a6eb49c2c649f1a4df51534f608653dab8b5e55a35afc57ba04a0ab6f4dea0edabac55c
SHA512
3f339f909c6d65a2e5b5c912785aaa6f297e95549c868ab679dfb8e99d67db9906b6e75e3679a4e3e003f512a54ceb9953f941a4129f488973c16e1a3ac7267c
diff --git a/app-emulation/gallium-nine-standalone/files/0.8-cross-files.patch
b/app-emulation/gallium-nine-standalone/files/0.8-cross-files.patch
new file mode 100644
index 00000000000..7aacc7b8bd9
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/files/0.8-cross-files.patch
@@ -0,0 +1,32 @@
+diff --color -Naur a/tools/cross-wine32.in b/tools/cross-wine32.in
+--- a/tools/cross-wine32.in 2021-04-24 11:27:05.044134837 +0100
++++ b/tools/cross-wine32.in 2021-04-24 11:28:55.880227178 +0100
+@@ -5,9 +5,10 @@
+ pkgconfig = '@PKG_CONFIG@'
+
+ [properties]
+-c_args = ['-m32']
+-c_link_args = ['-m32', '-mwindows', '-L@WINE32_LIBDIR@']
++c_args = @CFLAGS@ + ['-m32']
++c_link_args = @LDFLAGS@ + ['-m32', '-mwindows', '-L@WINE32_LIBDIR@']
+ needs_exe_wrapper = true
++pkg_config_libdir = '@PKG_CONFIG_LIBDIR@'
+
+ [host_machine]
+ system = 'linux'
+diff --color -Naur a/tools/cross-wine64.in b/tools/cross-wine64.in
+--- a/tools/cross-wine64.in 2021-04-24 11:27:05.044134837 +0100
++++ b/tools/cross-wine64.in 2021-04-24 11:29:14.999766636 +0100
+@@ -5,9 +5,10 @@
+ pkgconfig = '@PKG_CONFIG@'
+
+ [properties]
+-c_args = ['-m64']
+-c_link_args = ['-m64', '-mwindows', '-L@WINE64_LIBDIR@']
++c_args = @CFLAGS@ + ['-m64']
++c_link_args = @LDFLAGS@ + ['-m64', '-mwindows', '-L@WINE64_LIBDIR@']
+ needs_exe_wrapper = true
++pkg_config_libdir = '@PKG_CONFIG_LIBDIR@'
+
+ [host_machine]
+ system = 'linux'
diff --git
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8.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.8.ebuild
index ea0bcf68bed..38dfeb8e3b7 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8.ebuild
@@ -38,7 +38,7 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}"/0.7-cross-files.patch
+ "${FILESDIR}"/0.8-cross-files.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 ea0bcf68bed..38dfeb8e3b7 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}"/0.7-cross-files.patch
+ "${FILESDIR}"/0.8-cross-files.patch
"${FILESDIR}"/0.3-nine-dll-path.patch
)
