diff options
author | James Le Cuirot <chewi@gentoo.org> | 2023-10-29 22:45:16 +0000 |
---|---|---|
committer | James Le Cuirot <chewi@gentoo.org> | 2023-10-29 23:00:25 +0000 |
commit | 9e04c01982bbb17dad492e5411ea5176ce3d3fa0 (patch) | |
tree | de93cea4a96c317eb220e8ac5fafb40011778610 /app-emulation | |
parent | x11-libs/libnotify: Stabilize 0.8.3 x86, #916506 (diff) | |
download | gentoo-9e04c01982bbb17dad492e5411ea5176ce3d3fa0.tar.gz gentoo-9e04c01982bbb17dad492e5411ea5176ce3d3fa0.tar.bz2 gentoo-9e04c01982bbb17dad492e5411ea5176ce3d3fa0.zip |
app-emulation/gallium-nine-standalone: Drop old 0.7-r1
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'app-emulation')
4 files changed, 0 insertions, 172 deletions
diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest index 9d0095b1d5aa..8bf4e367ca22 100644 --- a/app-emulation/gallium-nine-standalone/Manifest +++ b/app-emulation/gallium-nine-standalone/Manifest @@ -1,2 +1 @@ -DIST gallium-nine-standalone-0.7.tar.gz 67699 BLAKE2B 85520de46e0e821f63d89691e322c3001ae853a0058a5077b484da6a1596a7ed03d2e2b7dc2686661fd21d34b33e10f4549437ce5790f18e1e6cc77c894e9d1e SHA512 9007564347bb6677f3d4eff83f744d39487c09b543489f02dcf7606917ecd9b72decf8176d9daecb6039b8998e97f737d9f7a71a5052f4d5c73f2e99e92af43c DIST gallium-nine-standalone-0.8.tar.gz 66656 BLAKE2B 5eaebcc514570dbaff44c4c889025d19a26c0b54941d1ab99ec131216a6eb49c2c649f1a4df51534f608653dab8b5e55a35afc57ba04a0ab6f4dea0edabac55c SHA512 3f339f909c6d65a2e5b5c912785aaa6f297e95549c868ab679dfb8e99d67db9906b6e75e3679a4e3e003f512a54ceb9953f941a4129f488973c16e1a3ac7267c diff --git a/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch b/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch deleted file mode 100644 index fed5c0403688..000000000000 --- a/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/tools/cross-wine32.in b/tools/cross-wine32.in -index bfbe410..0064cf8 100644 ---- a/tools/cross-wine32.in -+++ b/tools/cross-wine32.in -@@ -5,9 +5,10 @@ strip = 'strip' - pkgconfig = '@PKG_CONFIG@' - - [properties] --c_args = ['-m32'] --c_link_args = ['-m32', '-mwindows'] -+c_args = @CFLAGS@ + ['-m32'] -+c_link_args = @LDFLAGS@ + ['-m32', '-mwindows'] - needs_exe_wrapper = true -+pkg_config_libdir = '@PKG_CONFIG_LIBDIR@' - - [host_machine] - system = 'linux' -diff --git a/tools/cross-wine64.in b/tools/cross-wine64.in -index 5e19023..06b1f2a 100644 ---- a/tools/cross-wine64.in -+++ b/tools/cross-wine64.in -@@ -5,9 +5,10 @@ strip = 'strip' - pkgconfig = '@PKG_CONFIG@' - - [properties] --c_args = ['-m64'] --c_link_args = ['-m64', '-mwindows'] -+c_args = @CFLAGS@ + ['-m64'] -+c_link_args = @LDFLAGS@ + ['-m64', '-mwindows'] - needs_exe_wrapper = true -+pkg_config_libdir = '@PKG_CONFIG_LIBDIR@' - - [host_machine] - system = 'linux' diff --git a/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch b/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch deleted file mode 100644 index abcf7ad4ea3b..000000000000 --- a/app-emulation/gallium-nine-standalone/files/0.7-no-libwine.patch +++ /dev/null @@ -1,34 +0,0 @@ -From bddb53abdd1a77b1c019457f7eea4a6404a5e492 Mon Sep 17 00:00:00 2001 -From: Andre Heider <a.heider@gmail.com> -Date: Sun, 17 Jan 2021 11:42:57 +0100 -Subject: [PATCH] meson: stop checking for libwine - -From the WINE 6.0 release notes: -The libwine library is no longer used, but it's still provided to -support running Winelib modules built against older versions. It is -deprecated however, and will be removed in a future Wine release. - -libwine wasn't used anymore anyway, this just ensures that this tree can -be built against future WINE versions. ---- - meson.build | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 0969777..47ee51a 100644 ---- a/meson.build -+++ b/meson.build -@@ -35,12 +35,10 @@ code = '''#ifndef __WINE__ - #error 1 - #endif''' - --if not cc.compiles(code, name: 'winelib check') -+if not cc.compiles(code, name: 'winegcc check') - error('A WINE cross compiler is required') - endif - --dep_wine = cc.find_library('wine') -- - if not cc.has_header_symbol('windows.h', 'wine_get_unix_file_name') - error('WINE headers not found') - endif diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild deleted file mode 100644 index 1529b6ac411d..000000000000 --- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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/pkgconfig - virtual/wine[${MULTILIB_USEDEP}] - >=dev-util/meson-0.50.1 -" - -PATCHES=( - "${FILESDIR}"/0.7-no-libwine.patch - "${FILESDIR}"/0.7-cross-files.patch - "${FILESDIR}"/0.3-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_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \ - -e "s!@LDFLAGS@!$(_meson_env_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 -} - -pkg_postinst() { - local bits=$(bits) - - einfo "Don't remove the Z: drive from your WINEPREFIX as this relies on it." - einfo - einfo "To set up the ${bits}-bit library, launch your preferred Wine as follows:" - einfo " wine${bits/32} ${EPREFIX}/usr/$(get_libdir)/ninewinecfg.exe.so" - - if use abi_x86_64 && use abi_x86_32; then - einfo - einfo "To set up the 32-bit library, launch your preferred Wine as follows:" - einfo " wine ${EPREFIX}/usr/$(ABI=x86 get_libdir)/ninewinecfg.exe.so" - fi -} |