[gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/files/, ...

2023-10-29 Thread James Le Cuirot 
commit: 9e04c01982bbb17dad492e5411ea5176ce3d3fa0
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Oct 29 22:45:16 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Oct 29 23:00:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e04c019

app-emulation/gallium-nine-standalone: Drop old 0.7-r1

Signed-off-by: James Le Cuirot  gentoo.org>

 app-emulation/gallium-nine-standalone/Manifest |   1 -
 .../files/0.7-cross-files.patch|  34 ---
 .../files/0.7-no-libwine.patch |  34 ---
 .../gallium-nine-standalone-0.7-r1.ebuild  | 103 -
 4 files changed, 172 deletions(-)

diff --git a/app-emulation/gallium-nine-standalone/Manifest 
b/app-emulation/gallium-nine-standalone/Manifest
index 9d0095b1d5aa..8bf4e367ca22 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -1,2 +1 @@
-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.7-cross-files.patch 
b/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch
deleted file mode 100644
index fed5c0403688..
--- a/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/tools/cross-wine32.in b/tools/cross-wine32.in
-index bfbe410..0064cf8 100644
 a/tools/cross-wine32.in
-+++ b/tools/cross-wine32.in
-@@ -5,9 +5,10 @@ strip = 'strip'
- 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
-+pkg_config_libdir = '@PKG_CONFIG_LIBDIR@'
- 
- [host_machine]
- system = 'linux'
-diff --git a/tools/cross-wine64.in b/tools/cross-wine64.in
-index 5e19023..06b1f2a 100644
 a/tools/cross-wine64.in
-+++ b/tools/cross-wine64.in
-@@ -5,9 +5,10 @@ strip = 'strip'
- 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
-+pkg_config_libdir = '@PKG_CONFIG_LIBDIR@'
- 
- [host_machine]
- system = 'linux'

diff --git a/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch 
b/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch
deleted file mode 100644
index abcf7ad4ea3b..
--- a/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From bddb53abdd1a77b1c019457f7eea4a6404a5e492 Mon Sep 17 00:00:00 2001
-From: Andre Heider 
-Date: Sun, 17 Jan 2021 11:42:57 +0100
-Subject: [PATCH] meson: stop checking for libwine
-
-From the WINE 6.0 release notes:
-The libwine library is no longer used, but it's still provided to
-support running Winelib modules built against older versions. It is
-deprecated however, and will be removed in a future Wine release.
-
-libwine wasn't used anymore anyway, this just ensures that this tree can
-be built against future WINE versions.

- meson.build | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 0969777..47ee51a 100644
 a/meson.build
-+++ b/meson.build
-@@ -35,12 +35,10 @@ code = '''#ifndef __WINE__
- #error 1
- #endif'''
- 
--if not cc.compiles(code, name: 'winelib check')
-+if not cc.compiles(code, name: 'winegcc check')
-   error('A WINE cross compiler is required')
- endif
- 
--dep_wine = cc.find_library('wine')
--
- if not cc.has_header_symbol('windows.h', 'wine_get_unix_file_name')
-   error('WINE headers not found')
- endif

diff --git 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild
deleted file mode 100644
index 1529b6ac411d..
--- 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson-multilib toolchain-funcs
-
-MY_PN="wine-nine-standalone"
-DESCRIPTION="A standalone version of the WINE parts of Gallium Nine"
-HOMEPAGE="https://github.com/iXit/wine-nine-standalone;
-
-if [[ ${PV} = * ]];

[gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/files/, ...

2021-02-13 Thread James Le Cuirot 
commit: bc83e36e0f2d76fd4be83f5b210d414d706156f0
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Feb 13 23:19:45 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Feb 13 23:19:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc83e36e

app-emulation/gallium-nine-standalone: Upstream patch about libwine

Bug: https://github.com/iXit/wine-nine-standalone/issues/92
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 .../files/0.7-no-libwine.patch | 34 ++
 .../gallium-nine-standalone-0.7.ebuild |  3 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch 
b/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch
new file mode 100644
index 000..abcf7ad4ea3
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch
@@ -0,0 +1,34 @@
+From bddb53abdd1a77b1c019457f7eea4a6404a5e492 Mon Sep 17 00:00:00 2001
+From: Andre Heider 
+Date: Sun, 17 Jan 2021 11:42:57 +0100
+Subject: [PATCH] meson: stop checking for libwine
+
+From the WINE 6.0 release notes:
+The libwine library is no longer used, but it's still provided to
+support running Winelib modules built against older versions. It is
+deprecated however, and will be removed in a future Wine release.
+
+libwine wasn't used anymore anyway, this just ensures that this tree can
+be built against future WINE versions.
+---
+ meson.build | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 0969777..47ee51a 100644
+--- a/meson.build
 b/meson.build
+@@ -35,12 +35,10 @@ code = '''#ifndef __WINE__
+ #error 1
+ #endif'''
+ 
+-if not cc.compiles(code, name: 'winelib check')
++if not cc.compiles(code, name: 'winegcc check')
+   error('A WINE cross compiler is required')
+ endif
+ 
+-dep_wine = cc.find_library('wine')
+-
+ if not cc.has_header_symbol('windows.h', 'wine_get_unix_file_name')
+   error('WINE headers not found')
+ endif

diff --git 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
index 3e96326a2fc..ea3ad385cab 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,6 +38,7 @@ DEPEND="
 "
 
 PATCHES=(
+   "${FILESDIR}"/0.7-no-libwine.patch
"${FILESDIR}"/0.7-cross-files.patch
"${FILESDIR}"/0.3-nine-dll-path.patch
 )

[gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/files/, ...

2020-08-22 Thread James Le Cuirot 
commit: d16897964aed980a2bf5b0a173a459a0db295922
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Aug 22 20:00:18 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Aug 22 20:00:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1689796

app-emulation/gallium-nine-standalone: Set pkg-config LIBDIR

I'm still not sure exactly why this has broken now but thanks to
Michael Cook for the fix.

Closes: https://bugs.gentoo.org/730542
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: James Le Cuirot  gentoo.org>

 .../files/0.7-cross-files.patch| 34 ++
 .../gallium-nine-standalone-.ebuild|  5 ++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch 
b/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch
new file mode 100644
index 000..fed5c040368
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch
@@ -0,0 +1,34 @@
+diff --git a/tools/cross-wine32.in b/tools/cross-wine32.in
+index bfbe410..0064cf8 100644
+--- a/tools/cross-wine32.in
 b/tools/cross-wine32.in
+@@ -5,9 +5,10 @@ strip = 'strip'
+ 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
++pkg_config_libdir = '@PKG_CONFIG_LIBDIR@'
+ 
+ [host_machine]
+ system = 'linux'
+diff --git a/tools/cross-wine64.in b/tools/cross-wine64.in
+index 5e19023..06b1f2a 100644
+--- a/tools/cross-wine64.in
 b/tools/cross-wine64.in
+@@ -5,9 +5,10 @@ strip = 'strip'
+ 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
++pkg_config_libdir = '@PKG_CONFIG_LIBDIR@'
+ 
+ [host_machine]
+ system = 'linux'

diff --git 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
index 1cede2d1420..3e96326a2fc 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ DEPEND="
 "
 
 PATCHES=(
-   "${FILESDIR}"/0.5-flags.patch
+   "${FILESDIR}"/0.7-cross-files.patch
"${FILESDIR}"/0.3-nine-dll-path.patch
 )
 
@@ -67,6 +67,7 @@ src_prepare() {
-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} 
'-DG9DLL=${g9dll}'")!" \
-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
+   -e 
"s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!"
 \
${file}.in > ${file} || die
}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/files/, ...

2019-09-30 Thread James Le Cuirot 
commit: dd5d473e63ad1c696ebde0622e92b739b4d05489
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Sep 30 22:09:42 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Sep 30 22:09:42 2019 +
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  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-.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 000..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.in2019-09-25 13:25:24.0 +0100
 b/tools/cross-wine32.in2019-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.in2019-09-25 13:25:24.0 +0100
 b/tools/cross-wine64.in2019-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-.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-.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-.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-.ebuild 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
index 3c025087d82..1358e3c9e1c 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
@@ -38,7 +38,7 @@ DEPEND="
 "
 
 PATCHES=(
-   "${FILESDIR}"/flags.patch
+   "${FILESDIR}"/0.5-flags.patch
"${FILESDIR}"/0.3-nine-dll-path.patch
 )

[gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/files/, ...

2019-02-26 Thread James Le Cuirot 
commit: 22303f80085bab3b22af0b535097e237b302a033
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Feb 26 23:38:04 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Feb 26 23:38:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22303f80

app-emulation/gallium-nine-standalone: Version bump to 0.3

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 app-emulation/gallium-nine-standalone/Manifest   |  1 +
 .../files/0.3-nine-dll-path.patch| 13 +
 ...ne-.ebuild => gallium-nine-standalone-0.3.ebuild} | 16 +---
 .../gallium-nine-standalone-.ebuild  | 16 +---
 app-emulation/gallium-nine-standalone/metadata.xml   |  2 +-
 5 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/app-emulation/gallium-nine-standalone/Manifest 
b/app-emulation/gallium-nine-standalone/Manifest
index 725f6ef859f..963e790f0b2 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -1 +1,2 @@
+DIST gallium-nine-standalone-0.3.tar.gz 63887 BLAKE2B 
bd198617a5d3d3830bd5127b63eed2c82bff037141ae72ff9237ad5062fdbe9b6797e233eaf86e06d92153487c53389eb094b0be3b0cbdbf3fe565292a15cbb0
 SHA512 
80fedca58523fbf318109d2d3d5420e97d26ebf5b89b9f1965165c7a33c9dab9c62a65f14b75569b5126c549f5df91beef372d54e94dc90c608932eeb6a59829
 DIST gallium-nine-standalone-0_p20190113.tar.gz 58954 BLAKE2B 
29be3f5501cc4463aa05216b7360e2a5a949c498dd1c3a0170d5a2f7f508c1fe3171f90f8e35bbe95530be5d6b98b70c5a99362e69d4a64615e40fbb9c8eb96a
 SHA512 
2b2ab79b3d9f2c19967a16200cf69e7eba589d4d3d8918890b9504a5cb4895cd76000b6f3852baa738845e8508c6d67843f45d368225878d446ec6e907f75de4

diff --git 
a/app-emulation/gallium-nine-standalone/files/0.3-nine-dll-path.patch 
b/app-emulation/gallium-nine-standalone/files/0.3-nine-dll-path.patch
new file mode 100644
index 000..830bdc4b32e
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/files/0.3-nine-dll-path.patch
@@ -0,0 +1,13 @@
+diff --git a/ninewinecfg/main.c b/ninewinecfg/main.c
+index 3d58d67..e69668d 100644
+--- a/ninewinecfg/main.c
 b/ninewinecfg/main.c
+@@ -32,7 +32,7 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(ninecfg);
+ 
+-static const char * const fn_nine_dll = "d3d9-nine.dll";
++static const char * const fn_nine_dll = G9DLL;
+ static const char * const fn_d3d9_dll = "d3d9.dll";
+ static const char * const fn_nine_exe = "ninewinecfg.exe";
+ 

diff --git 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild
similarity index 87%
copy from 
app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
copy to app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild
index 0e73ee93be3..852055dc803 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild
@@ -5,16 +5,16 @@ EAPI=7
 
 inherit meson multilib-minimal toolchain-funcs
 
+MY_PN="wine-nine-standalone"
 DESCRIPTION="A standalone version of the WINE parts of Gallium Nine"
-HOMEPAGE="https://github.com/dhewg/nine;
+HOMEPAGE="https://github.com/iXit/wine-nine-standalone;
 
 if [[ $PV = * ]]; then
inherit git-r3
-   EGIT_REPO_URI="https://github.com/dhewg/nine.git;
+   EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git;
 else
-   COMMIT=""
-   SRC_URI="https://github.com/dhewg/nine/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-   S="${WORKDIR}/nine-${COMMIT}"
+   SRC_URI="https://github.com/iXit/${MY_PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   S="${WORKDIR}/${MY_PN}-${PV}"
KEYWORDS="-* ~amd64 ~x86"
 fi
 
@@ -25,7 +25,7 @@ SLOT="0"
 # Steam's Proton.
 
 RDEPEND="
-   media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+   media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
@@ -39,7 +39,7 @@ DEPEND="
 
 PATCHES=(
"${FILESDIR}"/flags.patch
-   "${FILESDIR}"/nine-dll-path.patch
+   "${FILESDIR}"/0.3-nine-dll-path.patch
 )
 
 bits() {
@@ -82,6 +82,8 @@ multilib_src_configure() {
local emesonargs=(
--cross-file "${S}/tools/cross-wine$(bits)"
--bindir "$(get_libdir)"
+   -Ddistro-independent=false
+   -Ddri2=false
)
meson_src_configure
 }

diff --git 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
index 0e73ee93be3..852055dc803 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-.ebuild
@@ -5,16 +5,16 @@ EAPI=7

[gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/files/, ...

2019-01-13 Thread James Le Cuirot 
commit: 98b911b67554ddbecaa92b471a6cbdf43716766a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jan 13 00:19:34 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jan 13 14:27:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98b911b6

app-emulation/gallium-nine-standalone: New package

Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 app-emulation/gallium-nine-standalone/Manifest |   1 +
 .../gallium-nine-standalone/files/flags.patch  |  28 ++
 .../files/nine-dll-path.patch  |  12 +++
 .../gallium-nine-standalone-0_p20190113.ebuild | 110 +
 .../gallium-nine-standalone-.ebuild| 110 +
 app-emulation/gallium-nine-standalone/metadata.xml |  20 
 6 files changed, 281 insertions(+)

diff --git a/app-emulation/gallium-nine-standalone/Manifest 
b/app-emulation/gallium-nine-standalone/Manifest
new file mode 100644
index 000..725f6ef859f
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -0,0 +1 @@
+DIST gallium-nine-standalone-0_p20190113.tar.gz 58954 BLAKE2B 
29be3f5501cc4463aa05216b7360e2a5a949c498dd1c3a0170d5a2f7f508c1fe3171f90f8e35bbe95530be5d6b98b70c5a99362e69d4a64615e40fbb9c8eb96a
 SHA512 
2b2ab79b3d9f2c19967a16200cf69e7eba589d4d3d8918890b9504a5cb4895cd76000b6f3852baa738845e8508c6d67843f45d368225878d446ec6e907f75de4

diff --git a/app-emulation/gallium-nine-standalone/files/flags.patch 
b/app-emulation/gallium-nine-standalone/files/flags.patch
new file mode 100644
index 000..217dcddf35b
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/files/flags.patch
@@ -0,0 +1,28 @@
+diff -Naur a/tools/cross-wine32.in b/tools/cross-wine32.in
+--- a/tools/cross-wine32.in2019-01-12 16:45:09.190471883 +
 b/tools/cross-wine32.in2019-01-12 16:48:22.569404982 +
+@@ -5,8 +5,8 @@
+ pkgconfig = '@PKG_CONFIG@'
+ 
+ [properties]
+-c_args = ['-m32', '--no-gnu-unique']
+-c_link_args = ['-m32', '-mwindows']
++c_args = @CFLAGS@ + ['-m32', '--no-gnu-unique']
++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.in2019-01-12 16:45:09.190471883 +
 b/tools/cross-wine64.in2019-01-12 16:48:19.865349306 +
+@@ -5,8 +5,8 @@
+ pkgconfig = '@PKG_CONFIG@'
+ 
+ [properties]
+-c_args = ['-m64', '--no-gnu-unique']
+-c_link_args = ['-m64', '-mwindows']
++c_args = @CFLAGS@ + ['-m64', '--no-gnu-unique']
++c_link_args = @LDFLAGS@ + ['-m64', '-mwindows']
+ needs_exe_wrapper = true
+ 
+ [host_machine]

diff --git a/app-emulation/gallium-nine-standalone/files/nine-dll-path.patch 
b/app-emulation/gallium-nine-standalone/files/nine-dll-path.patch
new file mode 100644
index 000..9399dde3e4f
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/files/nine-dll-path.patch
@@ -0,0 +1,12 @@
+diff -Naur a/ninewinecfg/main.c b/ninewinecfg/main.c
+--- a/ninewinecfg/main.c   2019-01-12 19:43:40.113737110 +
 b/ninewinecfg/main.c   2019-01-12 19:46:54.213703713 +
+@@ -47,7 +47,7 @@
+ #define WINE_STAGING 1
+ #endif
+
+-static const char * const fn_nine_dll = "d3d9-nine.dll";
++static const char * const fn_nine_dll = G9DLL;
+ static const char * const reg_path_dll_overrides = 
"Software\\Wine\\DllOverrides";
+ static const char * const reg_path_dll_redirects = 
"Software\\Wine\\DllRedirects";
+ static const char * const reg_key_d3d9 = "d3d9";

diff --git 
a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0_p20190113.ebuild
 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0_p20190113.ebuild
new file mode 100644
index 000..74e8ff9eb03
--- /dev/null
+++ 
b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0_p20190113.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson multilib-minimal toolchain-funcs
+
+DESCRIPTION="A standalone version of the WINE parts of Gallium Nine"
+HOMEPAGE="https://github.com/dhewg/nine;
+
+if [[ $PV = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/dhewg/nine.git;
+else
+   COMMIT="e10dd1a770c91d5ff13343c9a0186665b7df6114"
+   SRC_URI="https://github.com/dhewg/nine/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+   S="${WORKDIR}/nine-${COMMIT}"
+   KEYWORDS="-* ~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+# We don't put Wine in RDEPEND because you can also use this with
+# Steam's Proton.
+
+RDEPEND="
+   media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+   x11-libs/libX11[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libxcb[${MULTILIB_USEDEP}]
+"
+
+DEPEND="
+   ${RDEPEND}
+   virtual/pkgconfig[${MULTILIB_USEDEP}]
+   virtual/wine[${MULTILIB_USEDEP}]
+"
+