From eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 May 2019 12:02:00 +0100 Subject: gentoo resync : 04.05.2019 --- .../gallium-nine-standalone/gallium-nine-standalone-9999.ebuild | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild') 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 852055dc803a..868d83cdbb60 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 } -- cgit v1.2.3