From 5ee866097f7722d669e9a3b4ca2906105852e6ec Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 13 Feb 2024 23:36:16 +0000 Subject: gentoo auto-resync : 13:02:2024 - 23:36:16 --- app-emulation/Manifest.gz | Bin 15307 -> 15302 bytes app-emulation/gallium-nine-standalone/Manifest | 4 +- .../gallium-nine-standalone-0.9-r1.ebuild | 90 +++++++++++++++++++++ .../gallium-nine-standalone-0.9.ebuild | 90 --------------------- .../gallium-nine-standalone-9999.ebuild | 2 +- 5 files changed, 93 insertions(+), 93 deletions(-) create mode 100644 app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9-r1.ebuild delete mode 100644 app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.ebuild (limited to 'app-emulation') diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index a2d08dea2846..bb54fb440fa2 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest index 03ad86847b51..d728dc5ac3eb 100644 --- a/app-emulation/gallium-nine-standalone/Manifest +++ b/app-emulation/gallium-nine-standalone/Manifest @@ -4,6 +4,6 @@ AUX 0.9-nine-dll-path.patch 530 BLAKE2B 623da10b1628fcb848dc7cb481bdb978f8aacbe2 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 EBUILD gallium-nine-standalone-0.8-r1.ebuild 2277 BLAKE2B a7da98322fe26c827b23607f8f5f8b64e4d47a7f79b49cbdb19450a61167bab2c19522bf9125fcac83f20de707a7f5ed6756469796bc1945925b3a6e5578d83b SHA512 c1d589e147da94591da71db4d8f7d5cabb387857d6fc693dc1236877d69d75c28345bbe89f473c04167a6abc36d903ce255acd5491946d2b87686e34e86187e1 -EBUILD gallium-nine-standalone-0.9.ebuild 2298 BLAKE2B 07e7468d3a3c4ad77b46998e2f61b3891c59683168b0e797ff47b9a45965f4bbe1941d45170d6e66ba09ac371685ba1a7de7fdec9b0eb6801ff932024c761981 SHA512 112f10d9ec67156178f950b5718f8b00e70264b28af6c9dfe993d2b544b6cafb25d39d7ff8efb9064330e2bacd17b342bdcb46ea760f76f3e72bd05880c6f6cd -EBUILD gallium-nine-standalone-9999.ebuild 2298 BLAKE2B 07e7468d3a3c4ad77b46998e2f61b3891c59683168b0e797ff47b9a45965f4bbe1941d45170d6e66ba09ac371685ba1a7de7fdec9b0eb6801ff932024c761981 SHA512 112f10d9ec67156178f950b5718f8b00e70264b28af6c9dfe993d2b544b6cafb25d39d7ff8efb9064330e2bacd17b342bdcb46ea760f76f3e72bd05880c6f6cd +EBUILD gallium-nine-standalone-0.9-r1.ebuild 2298 BLAKE2B c1ed97a23a23560c653e0f1b3313a3c19e104e87c350f0637edf0f1e8ec50e8baae59653e7e79a6c14f12cf4723d031b45bebd04aea1025036e843d36cb051c3 SHA512 5e7e00997d3642c354f6e49f2459ced5bf49962b6d95e701a5d42c0bb5a3ffdf8abb269d691db3a1f403b14184032d817e79d2b5f19aeeea309b0787422cca19 +EBUILD gallium-nine-standalone-9999.ebuild 2298 BLAKE2B c1ed97a23a23560c653e0f1b3313a3c19e104e87c350f0637edf0f1e8ec50e8baae59653e7e79a6c14f12cf4723d031b45bebd04aea1025036e843d36cb051c3 SHA512 5e7e00997d3642c354f6e49f2459ced5bf49962b6d95e701a5d42c0bb5a3ffdf8abb269d691db3a1f403b14184032d817e79d2b5f19aeeea309b0787422cca19 MISC metadata.xml 775 BLAKE2B ef30d72621d34e789737d6d06973dd4fec33c1597a38c2d7e0a8d99e6d6c72a02218cf6f07ce7a80198a58fbfbee8322690fb6fc68c9ec95b935607626adf9de SHA512 ecb5a0c9d75a263f0ce0c2e8e541d5585b3b326b17af604764ccf07c5d230f193f46baa5bce8433e41775df7dedfd0270941645e67e1363901c50eacc3259701 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 new file mode 100644 index 000000000000..c34f0b868b29 --- /dev/null +++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9-r1.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 +} 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 deleted file mode 100644 index c66c70b8f145..000000000000 --- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.9.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 -} 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)!" \ -- cgit v1.2.3