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
}
