* [gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/
@ 2019-05-01 20:08 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2019-05-01 20:08 UTC (permalink / raw
To: gentoo-commits
commit: adc0e8a0cca980f5453b116bf9d447cb74e20cac
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed May 1 20:08:00 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed May 1 20:08:00 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adc0e8a0
app-emulation/gallium-nine-standalone: Version bump to 0.4
Thanks to Hello71 for discovering that the backslash madness is no
longer needed with newer Meson versions.
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
app-emulation/gallium-nine-standalone/Manifest | 1 +
...standalone-9999.ebuild => gallium-nine-standalone-0.4.ebuild} | 9 +++------
.../gallium-nine-standalone/gallium-nine-standalone-9999.ebuild | 9 +++------
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest
index 88ab0abf6c1..3d4616309b7 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.4.tar.gz 66820 BLAKE2B 7e7b0028f0c7e7c26fa1ee164e7e867fee39a5f315b750bfc3537e8720e9fbc625ca27fb28a58e8e521af455f8ab347d6fd6ca82786fe5ac9d76e368cd43466e SHA512 6af31e828400c6f711c76d91fb65215f4ba79c31b8d98f3e953b319593d96d1e5e78e07aca96529de37bbb89f3479a4d4db5f58e32ce7b98667284be10a9e532
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild
similarity index 89%
copy from app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
copy to app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild
index 852055dc803..868d83cdbb6 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild
@@ -27,7 +27,6 @@ SLOT="0"
RDEPEND="
media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
"
@@ -35,6 +34,7 @@ DEPEND="
${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
virtual/wine[${MULTILIB_USEDEP}]
+ >=dev-util/meson-0.50.1
"
PATCHES=(
@@ -61,14 +61,11 @@ src_prepare() {
# which doesn't play well with our multi-Wine environment.
bootstrap_nine() {
local file=tools/cross-wine$(bits)
- local g9dll=Z:${EPREFIX//\//\\}\\usr\\$(get_libdir)\\d3d9-nine.dll.so
-
- # Yes, these ridiculous backslashes are needed!
- g9dll=\\\\\\\\\\\"${g9dll//\\/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\}\\\\\\\\\\\"
+ local g9dll=\"Z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\"
sed \
-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
- -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} -DG9DLL=${g9dll}")!" \
+ -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
${file}.in > ${file} || die
}
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 852055dc803..868d83cdbb6 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@@ -27,7 +27,6 @@ SLOT="0"
RDEPEND="
media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
"
@@ -35,6 +34,7 @@ DEPEND="
${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
virtual/wine[${MULTILIB_USEDEP}]
+ >=dev-util/meson-0.50.1
"
PATCHES=(
@@ -61,14 +61,11 @@ src_prepare() {
# which doesn't play well with our multi-Wine environment.
bootstrap_nine() {
local file=tools/cross-wine$(bits)
- local g9dll=Z:${EPREFIX//\//\\}\\usr\\$(get_libdir)\\d3d9-nine.dll.so
-
- # Yes, these ridiculous backslashes are needed!
- g9dll=\\\\\\\\\\\"${g9dll//\\/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\}\\\\\\\\\\\"
+ local g9dll=\"Z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\"
sed \
-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
- -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} -DG9DLL=${g9dll}")!" \
+ -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
${file}.in > ${file} || die
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/
@ 2020-08-22 20:03 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2020-08-22 20:03 UTC (permalink / raw
To: gentoo-commits
commit: cd74f463fd47fb977e24435528091b79c7d35e8d
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 20:02:20 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 20:02:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd74f463
app-emulation/gallium-nine-standalone: Bump to 0.7
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
app-emulation/gallium-nine-standalone/Manifest | 1 +
.../gallium-nine-standalone-0.7.ebuild | 110 +++++++++++++++++++++
2 files changed, 111 insertions(+)
diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest
index 83e47d1230a..bb32fe0d3fb 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -1 +1,2 @@
DIST gallium-nine-standalone-0.5.tar.gz 69056 BLAKE2B 6acfd500a31e480e2e09e751097beaa2bc94c574edd2b313adb707dc65447be1868ed190bf13549cc38eae945d421242a5d3b2c068486ad35347903e27e0bf80 SHA512 6223a851536c67d32e3a834d7a3c7b93fb59c226b127e1ee1b5a72a7cc93172173f5004ca4944a842015650ef80e8427a684109ae5a4a9e9ef838961e0767c78
+DIST gallium-nine-standalone-0.7.tar.gz 67699 BLAKE2B 85520de46e0e821f63d89691e322c3001ae853a0058a5077b484da6a1596a7ed03d2e2b7dc2686661fd21d34b33e10f4549437ce5790f18e1e6cc77c894e9d1e SHA512 9007564347bb6677f3d4eff83f744d39487c09b543489f02dcf7606917ecd9b72decf8176d9daecb6039b8998e97f737d9f7a71a5052f4d5c73f2e99e92af43c
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
new file mode 100644
index 00000000000..3e96326a2fc
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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/iXit/wine-nine-standalone"
+
+if [[ $PV = 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git"
+else
+ 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
+
+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,dri3,X(+),${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libxcb[${MULTILIB_USEDEP}]
+"
+
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ virtual/wine[${MULTILIB_USEDEP}]
+ >=dev-util/meson-0.50.1
+"
+
+PATCHES=(
+ "${FILESDIR}"/0.7-cross-files.patch
+ "${FILESDIR}"/0.3-nine-dll-path.patch
+)
+
+bits() {
+ if [[ ${ABI} = amd64 ]]; then
+ echo 64
+ else
+ echo 32
+ fi
+}
+
+src_prepare() {
+ default
+
+ # Upstream includes a bootstrap.sh script with hardcoded CHOSTs to
+ # create the Meson cross files. We improve on that here but also
+ # inject CFLAGS and LDFLAGS, partly to simply respect these, and
+ # partly to allow d3d9-nine.dll to be loaded from a location outside
+ # WINEPREFIX. This avoids the need for the nine-install.sh script,
+ # which doesn't play well with our multi-Wine environment.
+ bootstrap_nine() {
+ local file=tools/cross-wine$(bits)
+ local g9dll=\"Z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\"
+
+ sed \
+ -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
+ }
+
+ multilib_foreach_abi bootstrap_nine
+}
+
+multilib_src_configure() {
+ # We override bindir because otherwise the 32-bit exe is overwritten
+ # by the 64-bit exe and we need both of them.
+ local emesonargs=(
+ --cross-file "${S}/tools/cross-wine$(bits)"
+ --bindir "$(get_libdir)"
+ -Ddistro-independent=false
+ -Ddri2=false
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_install() {
+ meson_src_install
+}
+
+pkg_postinst() {
+ local bits=$(bits)
+
+ einfo "Don't remove the Z: drive from your WINEPREFIX as this relies on it."
+ einfo
+ einfo "To set up the ${bits}-bit library, launch your preferred Wine as follows:"
+ einfo " wine${bits/32} ${EPREFIX}/usr/$(get_libdir)/ninewinecfg.exe.so"
+
+ if use abi_x86_64 && use abi_x86_32; then
+ einfo
+ einfo "To set up the 32-bit library, launch your preferred Wine as follows:"
+ einfo " wine ${EPREFIX}/usr/$(ABI=x86 get_libdir)/ninewinecfg.exe.so"
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/
@ 2021-07-21 22:33 Matt Turner
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2021-07-21 22:33 UTC (permalink / raw
To: gentoo-commits
commit: 2c9ae144a7d83cc4a585d58cdec07eb123cc76d8
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 21 22:29:28 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jul 21 22:33:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c9ae144
app-emulation/gallium-nine-standalone: Remove dependence on mesa[dri3]
Mesa has a REQUIRED_USE="d3d9? ( dri3 )", so it wasn't necessary anyway,
but I'm removing IUSE=dri3 from Mesa entirely, so this has to be
updated.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
...nine-standalone-0.7.ebuild => gallium-nine-standalone-0.7-r1.ebuild} | 2 +-
...nine-standalone-0.8.ebuild => gallium-nine-standalone-0.8-r1.ebuild} | 2 +-
.../gallium-nine-standalone/gallium-nine-standalone-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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-r1.ebuild
similarity index 98%
rename from app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
rename to app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild
index ca5620c0886..1529b6ac411 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
# Steam's Proton.
RDEPEND="
- media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
+ media-libs/mesa[d3d9,X(+),${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
"
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8-r1.ebuild
similarity index 97%
rename from app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8.ebuild
rename to app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8-r1.ebuild
index d995a9f7258..d9a079e97a2 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8-r1.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
# Steam's Proton.
RDEPEND="
- media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
+ media-libs/mesa[d3d9,X(+),${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
"
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 d995a9f7258..d9a079e97a2 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
# Steam's Proton.
RDEPEND="
- media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
+ media-libs/mesa[d3d9,X(+),${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/
@ 2023-10-29 23:00 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2023-10-29 23:00 UTC (permalink / raw
To: gentoo-commits
commit: ecadd137d4240f6302589e70c0ae782e336e5e9b
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 22:59:46 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 23:00:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecadd137
app-emulation/gallium-nine-standalone: Use meson-format-array
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../gallium-nine-standalone-0.9.ebuild | 11 +++++++----
.../gallium-nine-standalone-9999.ebuild | 11 +++++++----
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
index a2a9c3b6ce1b..3da718cb8610 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
@@ -32,9 +32,12 @@ RDEPEND="
DEPEND="
${RDEPEND}
- virtual/pkgconfig
virtual/wine[${MULTILIB_USEDEP}]
- >=dev-util/meson-0.50.1
+"
+
+BDEPEND="
+ dev-util/meson-format-array
+ virtual/pkgconfig
"
PATCHES=(
@@ -65,8 +68,8 @@ src_prepare() {
sed \
-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!@CFLAGS@!$(meson-format-array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
+ -e "s!@LDFLAGS@!$(meson-format-array "${LDFLAGS}")!" \
-e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
${file}.in > ${file} || die
}
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 a2a9c3b6ce1b..3da718cb8610 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@@ -32,9 +32,12 @@ RDEPEND="
DEPEND="
${RDEPEND}
- virtual/pkgconfig
virtual/wine[${MULTILIB_USEDEP}]
- >=dev-util/meson-0.50.1
+"
+
+BDEPEND="
+ dev-util/meson-format-array
+ virtual/pkgconfig
"
PATCHES=(
@@ -65,8 +68,8 @@ src_prepare() {
sed \
-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!@CFLAGS@!$(meson-format-array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
+ -e "s!@LDFLAGS@!$(meson-format-array "${LDFLAGS}")!" \
-e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
${file}.in > ${file} || die
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/
@ 2024-02-13 22:23 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2024-02-13 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 1c28c05cda60c803c4ffd196861efc73d7a978bc
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 13 22:21:48 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Feb 13 22:21:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c28c05c
app-emulation/gallium-nine-standalone: Fix ninewinecfg detection in 0.9
This was broken because it was comparing the string Z:\ against z:\.
Closes: https://bugs.gentoo.org/924020
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
...nine-standalone-0.9.ebuild => gallium-nine-standalone-0.9-r1.ebuild} | 2 +-
.../gallium-nine-standalone/gallium-nine-standalone-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9-r1.ebuild
similarity index 97%
rename from app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
rename to app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9-r1.ebuild
index c66c70b8f145..c34f0b868b29 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9-r1.ebuild
@@ -64,7 +64,7 @@ src_prepare() {
# which doesn't play well with our multi-Wine environment.
bootstrap_nine() {
local file=tools/cross-wine$(bits)
- local g9dll=\"Z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\"
+ local g9dll=\"z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\"
sed \
-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
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 c66c70b8f145..c34f0b868b29 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@@ -64,7 +64,7 @@ src_prepare() {
# which doesn't play well with our multi-Wine environment.
bootstrap_nine() {
local file=tools/cross-wine$(bits)
- local g9dll=\"Z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\"
+ local g9dll=\"z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\"
sed \
-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/
@ 2024-12-28 22:52 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2024-12-28 22:52 UTC (permalink / raw
To: gentoo-commits
commit: 2e1b8575b3954efc2b0c5d158cceb888803ec5cf
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 22:47:54 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 22:52:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e1b8575
app-emulation/gallium-nine-standalone: Drop old 0.8-r1 and 0.9-r1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
app-emulation/gallium-nine-standalone/Manifest | 2 -
.../gallium-nine-standalone-0.8-r1.ebuild | 87 ---------------------
.../gallium-nine-standalone-0.9-r1.ebuild | 90 ----------------------
3 files changed, 179 deletions(-)
diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest
index 19d2d1a09c40..a5b5c2c3de74 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -1,3 +1 @@
DIST gallium-nine-standalone-0.10.tar.gz 67966 BLAKE2B ef93642d518add1d35852e1899c7dcdb7b8b8140dc0bbe178d29f5d2a0c8414fb538862caf8cd26a8d84835bb71a457cdaece05c2c8b32bd572cb02de3b56e35 SHA512 d8268f3195ae72a58d93e790206670d28e7081c4c897ab60edb6c9d745e5069c834afb7f4c866916255122c3b5cf830a202af05fdd3a4430271c4508e79d03a6
-DIST gallium-nine-standalone-0.8.tar.gz 66656 BLAKE2B 5eaebcc514570dbaff44c4c889025d19a26c0b54941d1ab99ec131216a6eb49c2c649f1a4df51534f608653dab8b5e55a35afc57ba04a0ab6f4dea0edabac55c SHA512 3f339f909c6d65a2e5b5c912785aaa6f297e95549c868ab679dfb8e99d67db9906b6e75e3679a4e3e003f512a54ceb9953f941a4129f488973c16e1a3ac7267c
-DIST gallium-nine-standalone-0.9.tar.gz 67687 BLAKE2B 24e4250cacde3306cdfa8d9b24fa2fa0eb7dee4e5722973baa59f25999a75e689acad4c24c8bbfbc34aaddc24bdfe1977ff2f85da08a81b4ce6b222d5d0bfae0 SHA512 1ed384563736ab5db4167ca28163c93e58e9ff7ee62656d4adea8bc937484aebce3ed06f4600a080ad61fcfedd12febb3db9430be6cc8dd97484982694fde3a7
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8-r1.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8-r1.ebuild
deleted file mode 100644
index fdf6d7e33058..000000000000
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 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} = 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git"
-else
- 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
-
-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,X(+),${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libxcb[${MULTILIB_USEDEP}]
-"
-
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- virtual/wine[${MULTILIB_USEDEP}]
- >=dev-build/meson-0.50.1
-"
-
-PATCHES=(
- "${FILESDIR}"/0.8-cross-files.patch
- "${FILESDIR}"/0.3-nine-dll-path.patch
-)
-
-bits() {
- if [[ ${ABI} = amd64 ]]; then
- echo 64
- else
- echo 32
- fi
-}
-
-src_prepare() {
- default
-
- # Upstream includes a bootstrap.sh script with hardcoded CHOSTs to
- # create the Meson cross files. We improve on that here but also
- # inject CFLAGS and LDFLAGS, partly to simply respect these, and
- # partly to allow d3d9-nine.dll to be loaded from a location outside
- # WINEPREFIX. This avoids the need for the nine-install.sh script,
- # which doesn't play well with our multi-Wine environment.
- bootstrap_nine() {
- local file=tools/cross-wine$(bits)
- local g9dll=\"Z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\"
-
- sed \
- -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
- }
-
- multilib_foreach_abi bootstrap_nine
-}
-
-multilib_src_configure() {
- # We override bindir because otherwise the 32-bit exe is overwritten
- # by the 64-bit exe and we need both of them.
- 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-0.9-r1.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9-r1.ebuild
deleted file mode 100644
index c34f0b868b29..000000000000
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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} = 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git"
-else
- 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
-
-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,X(+),${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libxcb[${MULTILIB_USEDEP}]
-"
-
-DEPEND="
- ${RDEPEND}
- virtual/wine[${MULTILIB_USEDEP}]
-"
-
-BDEPEND="
- dev-build/meson-format-array
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/0.8-cross-files.patch
- "${FILESDIR}"/0.9-nine-dll-path.patch
-)
-
-bits() {
- if [[ ${ABI} = amd64 ]]; then
- echo 64
- else
- echo 32
- fi
-}
-
-src_prepare() {
- default
-
- # Upstream includes a bootstrap.sh script with hardcoded CHOSTs to
- # create the Meson cross files. We improve on that here but also
- # inject CFLAGS and LDFLAGS, partly to simply respect these, and
- # partly to allow d3d9-nine.dll to be loaded from a location outside
- # WINEPREFIX. This avoids the need for the nine-install.sh script,
- # which doesn't play well with our multi-Wine environment.
- bootstrap_nine() {
- local file=tools/cross-wine$(bits)
- local g9dll=\"z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\"
-
- sed \
- -e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
- -e "s!@CFLAGS@!$(meson-format-array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
- -e "s!@LDFLAGS@!$(meson-format-array "${LDFLAGS}")!" \
- -e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
- ${file}.in > ${file} || die
- }
-
- multilib_foreach_abi bootstrap_nine
-}
-
-multilib_src_configure() {
- # We override bindir because otherwise the 32-bit exe is overwritten
- # by the 64-bit exe and we need both of them.
- local emesonargs=(
- --cross-file "${S}/tools/cross-wine$(bits)"
- --bindir "$(get_libdir)"
- -Ddistro-independent=false
- -Ddri2=false
- )
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/
@ 2024-12-28 22:52 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2024-12-28 22:52 UTC (permalink / raw
To: gentoo-commits
commit: fe5cd60b83061b6f010edff5ad2aed32d8067e49
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 22:47:31 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 22:52:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe5cd60b
app-emulation/gallium-nine-standalone: Version bump to 0.10
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
app-emulation/gallium-nine-standalone/Manifest | 1 +
.../gallium-nine-standalone-0.10.ebuild | 90 ++++++++++++++++++++++
2 files changed, 91 insertions(+)
diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest
index 90d5abcd33ea..19d2d1a09c40 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -1,2 +1,3 @@
+DIST gallium-nine-standalone-0.10.tar.gz 67966 BLAKE2B ef93642d518add1d35852e1899c7dcdb7b8b8140dc0bbe178d29f5d2a0c8414fb538862caf8cd26a8d84835bb71a457cdaece05c2c8b32bd572cb02de3b56e35 SHA512 d8268f3195ae72a58d93e790206670d28e7081c4c897ab60edb6c9d745e5069c834afb7f4c866916255122c3b5cf830a202af05fdd3a4430271c4508e79d03a6
DIST gallium-nine-standalone-0.8.tar.gz 66656 BLAKE2B 5eaebcc514570dbaff44c4c889025d19a26c0b54941d1ab99ec131216a6eb49c2c649f1a4df51534f608653dab8b5e55a35afc57ba04a0ab6f4dea0edabac55c SHA512 3f339f909c6d65a2e5b5c912785aaa6f297e95549c868ab679dfb8e99d67db9906b6e75e3679a4e3e003f512a54ceb9953f941a4129f488973c16e1a3ac7267c
DIST gallium-nine-standalone-0.9.tar.gz 67687 BLAKE2B 24e4250cacde3306cdfa8d9b24fa2fa0eb7dee4e5722973baa59f25999a75e689acad4c24c8bbfbc34aaddc24bdfe1977ff2f85da08a81b4ce6b222d5d0bfae0 SHA512 1ed384563736ab5db4167ca28163c93e58e9ff7ee62656d4adea8bc937484aebce3ed06f4600a080ad61fcfedd12febb3db9430be6cc8dd97484982694fde3a7
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.10.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.10.ebuild
new file mode 100644
index 000000000000..c34f0b868b29
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.10.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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} = 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git"
+else
+ 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
+
+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,X(+),${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libxcb[${MULTILIB_USEDEP}]
+"
+
+DEPEND="
+ ${RDEPEND}
+ virtual/wine[${MULTILIB_USEDEP}]
+"
+
+BDEPEND="
+ dev-build/meson-format-array
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/0.8-cross-files.patch
+ "${FILESDIR}"/0.9-nine-dll-path.patch
+)
+
+bits() {
+ if [[ ${ABI} = amd64 ]]; then
+ echo 64
+ else
+ echo 32
+ fi
+}
+
+src_prepare() {
+ default
+
+ # Upstream includes a bootstrap.sh script with hardcoded CHOSTs to
+ # create the Meson cross files. We improve on that here but also
+ # inject CFLAGS and LDFLAGS, partly to simply respect these, and
+ # partly to allow d3d9-nine.dll to be loaded from a location outside
+ # WINEPREFIX. This avoids the need for the nine-install.sh script,
+ # which doesn't play well with our multi-Wine environment.
+ bootstrap_nine() {
+ local file=tools/cross-wine$(bits)
+ local g9dll=\"z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\"
+
+ sed \
+ -e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
+ -e "s!@CFLAGS@!$(meson-format-array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
+ -e "s!@LDFLAGS@!$(meson-format-array "${LDFLAGS}")!" \
+ -e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
+ ${file}.in > ${file} || die
+ }
+
+ multilib_foreach_abi bootstrap_nine
+}
+
+multilib_src_configure() {
+ # We override bindir because otherwise the 32-bit exe is overwritten
+ # by the 64-bit exe and we need both of them.
+ local emesonargs=(
+ --cross-file "${S}/tools/cross-wine$(bits)"
+ --bindir "$(get_libdir)"
+ -Ddistro-independent=false
+ -Ddri2=false
+ )
+ meson_src_configure
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-12-28 22:52 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-28 22:52 [gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2024-12-28 22:52 James Le Cuirot
2024-02-13 22:23 James Le Cuirot
2023-10-29 23:00 James Le Cuirot
2021-07-21 22:33 Matt Turner
2020-08-22 20:03 James Le Cuirot
2019-05-01 20:08 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox