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

[James Le Cuirot]

commit:     22303f80085bab3b22af0b535097e237b302a033
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 26 23:38:04 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Feb 26 23:38:04 2019 +0000
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 <chewi <AT> gentoo.org>

 app-emulation/gallium-nine-standalone/Manifest           |  1 +
 .../files/0.3-nine-dll-path.patch                        | 13 +++++++++++++
 ...ne-9999.ebuild => gallium-nine-standalone-0.3.ebuild} | 16 +++++++++-------
 .../gallium-nine-standalone-9999.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 00000000000..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-9999.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-9999.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-9999.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 = 9999* ]]; 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-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
index 0e73ee93be3..852055dc803 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.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 = 9999* ]]; 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/metadata.xml b/app-emulation/gallium-nine-standalone/metadata.xml
index c661f33f58d..99949f5b76d 100644
--- a/app-emulation/gallium-nine-standalone/metadata.xml
+++ b/app-emulation/gallium-nine-standalone/metadata.xml
@@ -15,6 +15,6 @@ Gallium Nine Standalone, as the name implies, is a standalone version of the WIN
 This decouples Gallium Nine from the WINE tree, so that it can be used with any WINE version. There is no need for any WINE patches. A stable, development, or staging WINE release is sufficient.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">dhewg/nine</remote-id>
+		<remote-id type="github">iXit/wine-nine-standalone</remote-id>
 	</upstream>
 </pkgmetadata>