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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/
Date: Wed,  1 May 2019 20:08:24 +0000 (UTC)	[thread overview]
Message-ID: <1556741280.adc0e8a0cca980f5453b116bf9d447cb74e20cac.chewi@gentoo> (raw)

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
 	}

next             reply	other threads:[~2019-05-01 20:08 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-01 20:08 James Le Cuirot [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-08-22 20:03 [gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/ James Le Cuirot
2021-07-21 22:33 Matt Turner
2023-10-29 23:00 James Le Cuirot
2024-02-13 22:23 James Le Cuirot
2024-12-28 22:52 James Le Cuirot
2024-12-28 22:52 James Le Cuirot

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:88ab0abf6c dfblob:3d4616309b dfblob:852055dc80
dfblob:868d83cdbb dfblob:852055dc80 dfblob:868d83cdbb )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: app-emulation/gallium-nine-standalone/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1556741280.adc0e8a0cca980f5453b116bf9d447cb74e20cac.chewi@gentoo \
    --to=chewi@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox