commit: d4679990e194e21a229fa929bdba3228c4397329 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Wed Oct 1 20:22:15 2025 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Wed Oct 1 20:23:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4679990
app-emulation/gallium-nine-standalone: treeclean Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> app-emulation/gallium-nine-standalone/Manifest | 1 - .../files/0.8-cross-files.patch | 32 -------- .../files/0.9-nine-dll-path.patch | 12 --- .../gallium-nine-standalone-0.10.ebuild | 90 ---------------------- .../gallium-nine-standalone-9999.ebuild | 90 ---------------------- app-emulation/gallium-nine-standalone/metadata.xml | 20 ----- profiles/package.mask | 5 -- 7 files changed, 250 deletions(-) diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest deleted file mode 100644 index a5b5c2c3de74..000000000000 --- a/app-emulation/gallium-nine-standalone/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gallium-nine-standalone-0.10.tar.gz 67966 BLAKE2B ef93642d518add1d35852e1899c7dcdb7b8b8140dc0bbe178d29f5d2a0c8414fb538862caf8cd26a8d84835bb71a457cdaece05c2c8b32bd572cb02de3b56e35 SHA512 d8268f3195ae72a58d93e790206670d28e7081c4c897ab60edb6c9d745e5069c834afb7f4c866916255122c3b5cf830a202af05fdd3a4430271c4508e79d03a6 diff --git a/app-emulation/gallium-nine-standalone/files/0.8-cross-files.patch b/app-emulation/gallium-nine-standalone/files/0.8-cross-files.patch deleted file mode 100644 index 7aacc7b8bd9b..000000000000 --- a/app-emulation/gallium-nine-standalone/files/0.8-cross-files.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --color -Naur a/tools/cross-wine32.in b/tools/cross-wine32.in ---- a/tools/cross-wine32.in 2021-04-24 11:27:05.044134837 +0100 -+++ b/tools/cross-wine32.in 2021-04-24 11:28:55.880227178 +0100 -@@ -5,9 +5,10 @@ - pkgconfig = '@PKG_CONFIG@' - - [properties] --c_args = ['-m32'] --c_link_args = ['-m32', '-mwindows', '-L@WINE32_LIBDIR@'] -+c_args = @CFLAGS@ + ['-m32'] -+c_link_args = @LDFLAGS@ + ['-m32', '-mwindows', '-L@WINE32_LIBDIR@'] - needs_exe_wrapper = true -+pkg_config_libdir = '@PKG_CONFIG_LIBDIR@' - - [host_machine] - system = 'linux' -diff --color -Naur a/tools/cross-wine64.in b/tools/cross-wine64.in ---- a/tools/cross-wine64.in 2021-04-24 11:27:05.044134837 +0100 -+++ b/tools/cross-wine64.in 2021-04-24 11:29:14.999766636 +0100 -@@ -5,9 +5,10 @@ - pkgconfig = '@PKG_CONFIG@' - - [properties] --c_args = ['-m64'] --c_link_args = ['-m64', '-mwindows', '-L@WINE64_LIBDIR@'] -+c_args = @CFLAGS@ + ['-m64'] -+c_link_args = @LDFLAGS@ + ['-m64', '-mwindows', '-L@WINE64_LIBDIR@'] - needs_exe_wrapper = true -+pkg_config_libdir = '@PKG_CONFIG_LIBDIR@' - - [host_machine] - system = 'linux' diff --git a/app-emulation/gallium-nine-standalone/files/0.9-nine-dll-path.patch b/app-emulation/gallium-nine-standalone/files/0.9-nine-dll-path.patch deleted file mode 100644 index 14c2b30a741f..000000000000 --- a/app-emulation/gallium-nine-standalone/files/0.9-nine-dll-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/ninewinecfg/main.c b/ninewinecfg/main.c ---- a/ninewinecfg/main.c 2023-03-10 08:32:25.000000000 +0000 -+++ b/ninewinecfg/main.c 2023-10-29 22:49:15.919529033 +0000 -@@ -28,7 +28,7 @@ - #include "../common/registry.h" - #include "resource.h" - --static const char * const fn_nine_dll = "d3d9-nine.dll"; -+static const char * const fn_nine_dll = G9DLL; - static const char * const fn_backup_dll = "d3d9-nine.bak"; - static const char * const fn_d3d9_dll = "d3d9.dll"; - static const char * const fn_nine_exe = "ninewinecfg.exe"; diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.10.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.10.ebuild deleted file mode 100644 index c34f0b868b29..000000000000 --- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.10.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 deleted file mode 100644 index c34f0b868b29..000000000000 --- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.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/metadata.xml b/app-emulation/gallium-nine-standalone/metadata.xml deleted file mode 100644 index cad8073ddece..000000000000 --- a/app-emulation/gallium-nine-standalone/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>James Le Cuirot</name> - </maintainer> - <maintainer type="project"> - <email>[email protected]</email> - <name>Wine</name> - </maintainer> - <longdescription> -Gallium Nine Standalone, as the name implies, is a standalone version of the WINE parts of Gallium Nine. - -This decouples Gallium Nine from the WINE tree, so that it can be used with any WINE version. There is no need for any WINE patches. A stable, development, or staging WINE release is sufficient. - </longdescription> - <upstream> - <remote-id type="github">iXit/wine-nine-standalone</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 5d4e462c4f80..80b860801946 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -217,11 +217,6 @@ app-vim/voom # Obsolete transitional meta package. Bug #961795. Removal on 2025-09-28. media-sound/pulseaudio -# James Le Cuirot <[email protected]> (2025-08-21) -# The required Direct3D 9 feature is being dropped from Mesa. Use DXVK or -# WineD3D instead. Removal on 2025-09-21. -app-emulation/gallium-nine-standalone - # Michał Górny <[email protected]> (2025-08-21) # Version yanked due to "unintended change in behavior". =dev-python/click-8.2.2
