| 1 |
commit: adc0e8a0cca980f5453b116bf9d447cb74e20cac |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 1 20:08:00 2019 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 1 20:08:00 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adc0e8a0 |
| 7 |
|
| 8 |
app-emulation/gallium-nine-standalone: Version bump to 0.4 |
| 9 |
|
| 10 |
Thanks to Hello71 for discovering that the backslash madness is no |
| 11 |
longer needed with newer Meson versions. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
| 14 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 15 |
|
| 16 |
app-emulation/gallium-nine-standalone/Manifest | 1 + |
| 17 |
...standalone-9999.ebuild => gallium-nine-standalone-0.4.ebuild} | 9 +++------ |
| 18 |
.../gallium-nine-standalone/gallium-nine-standalone-9999.ebuild | 9 +++------ |
| 19 |
3 files changed, 7 insertions(+), 12 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest |
| 22 |
index 88ab0abf6c1..3d4616309b7 100644 |
| 23 |
--- a/app-emulation/gallium-nine-standalone/Manifest |
| 24 |
+++ b/app-emulation/gallium-nine-standalone/Manifest |
| 25 |
@@ -1 +1,2 @@ |
| 26 |
DIST gallium-nine-standalone-0.3.tar.gz 63887 BLAKE2B bd198617a5d3d3830bd5127b63eed2c82bff037141ae72ff9237ad5062fdbe9b6797e233eaf86e06d92153487c53389eb094b0be3b0cbdbf3fe565292a15cbb0 SHA512 80fedca58523fbf318109d2d3d5420e97d26ebf5b89b9f1965165c7a33c9dab9c62a65f14b75569b5126c549f5df91beef372d54e94dc90c608932eeb6a59829 |
| 27 |
+DIST gallium-nine-standalone-0.4.tar.gz 66820 BLAKE2B 7e7b0028f0c7e7c26fa1ee164e7e867fee39a5f315b750bfc3537e8720e9fbc625ca27fb28a58e8e521af455f8ab347d6fd6ca82786fe5ac9d76e368cd43466e SHA512 6af31e828400c6f711c76d91fb65215f4ba79c31b8d98f3e953b319593d96d1e5e78e07aca96529de37bbb89f3479a4d4db5f58e32ce7b98667284be10a9e532 |
| 28 |
|
| 29 |
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 |
| 30 |
similarity index 89% |
| 31 |
copy from app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild |
| 32 |
copy to app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild |
| 33 |
index 852055dc803..868d83cdbb6 100644 |
| 34 |
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild |
| 35 |
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild |
| 36 |
@@ -27,7 +27,6 @@ SLOT="0" |
| 37 |
RDEPEND=" |
| 38 |
media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}] |
| 39 |
x11-libs/libX11[${MULTILIB_USEDEP}] |
| 40 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
| 41 |
x11-libs/libxcb[${MULTILIB_USEDEP}] |
| 42 |
" |
| 43 |
|
| 44 |
@@ -35,6 +34,7 @@ DEPEND=" |
| 45 |
${RDEPEND} |
| 46 |
virtual/pkgconfig[${MULTILIB_USEDEP}] |
| 47 |
virtual/wine[${MULTILIB_USEDEP}] |
| 48 |
+ >=dev-util/meson-0.50.1 |
| 49 |
" |
| 50 |
|
| 51 |
PATCHES=( |
| 52 |
@@ -61,14 +61,11 @@ src_prepare() { |
| 53 |
# which doesn't play well with our multi-Wine environment. |
| 54 |
bootstrap_nine() { |
| 55 |
local file=tools/cross-wine$(bits) |
| 56 |
- local g9dll=Z:${EPREFIX//\//\\}\\usr\\$(get_libdir)\\d3d9-nine.dll.so |
| 57 |
- |
| 58 |
- # Yes, these ridiculous backslashes are needed! |
| 59 |
- g9dll=\\\\\\\\\\\"${g9dll//\\/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\}\\\\\\\\\\\" |
| 60 |
+ local g9dll=\"Z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\" |
| 61 |
|
| 62 |
sed \ |
| 63 |
-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \ |
| 64 |
- -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} -DG9DLL=${g9dll}")!" \ |
| 65 |
+ -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \ |
| 66 |
-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \ |
| 67 |
${file}.in > ${file} || die |
| 68 |
} |
| 69 |
|
| 70 |
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild |
| 71 |
index 852055dc803..868d83cdbb6 100644 |
| 72 |
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild |
| 73 |
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild |
| 74 |
@@ -27,7 +27,6 @@ SLOT="0" |
| 75 |
RDEPEND=" |
| 76 |
media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}] |
| 77 |
x11-libs/libX11[${MULTILIB_USEDEP}] |
| 78 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
| 79 |
x11-libs/libxcb[${MULTILIB_USEDEP}] |
| 80 |
" |
| 81 |
|
| 82 |
@@ -35,6 +34,7 @@ DEPEND=" |
| 83 |
${RDEPEND} |
| 84 |
virtual/pkgconfig[${MULTILIB_USEDEP}] |
| 85 |
virtual/wine[${MULTILIB_USEDEP}] |
| 86 |
+ >=dev-util/meson-0.50.1 |
| 87 |
" |
| 88 |
|
| 89 |
PATCHES=( |
| 90 |
@@ -61,14 +61,11 @@ src_prepare() { |
| 91 |
# which doesn't play well with our multi-Wine environment. |
| 92 |
bootstrap_nine() { |
| 93 |
local file=tools/cross-wine$(bits) |
| 94 |
- local g9dll=Z:${EPREFIX//\//\\}\\usr\\$(get_libdir)\\d3d9-nine.dll.so |
| 95 |
- |
| 96 |
- # Yes, these ridiculous backslashes are needed! |
| 97 |
- g9dll=\\\\\\\\\\\"${g9dll//\\/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\}\\\\\\\\\\\" |
| 98 |
+ local g9dll=\"Z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\" |
| 99 |
|
| 100 |
sed \ |
| 101 |
-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \ |
| 102 |
- -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} -DG9DLL=${g9dll}")!" \ |
| 103 |
+ -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \ |
| 104 |
-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \ |
| 105 |
${file}.in > ${file} || die |
| 106 |
} |
Archives