From 1e1e7636b59380beebd325e8d256875e4f824230 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 8 Jan 2024 18:59:30 +0000 Subject: gentoo auto-resync : 08:01:2024 - 18:59:30 --- app-emulation/wine-proton/Manifest | 8 +- app-emulation/wine-proton/wine-proton-7.0.6.ebuild | 4 +- .../wine-proton/wine-proton-8.0.3c.ebuild | 363 --------------------- app-emulation/wine-proton/wine-proton-8.0.4.ebuild | 6 +- .../wine-proton/wine-proton-8.0.9999.ebuild | 2 +- 5 files changed, 9 insertions(+), 374 deletions(-) delete mode 100644 app-emulation/wine-proton/wine-proton-8.0.3c.ebuild (limited to 'app-emulation/wine-proton') diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest index d58d54ccf3fc..4718472bc031 100644 --- a/app-emulation/wine-proton/Manifest +++ b/app-emulation/wine-proton/Manifest @@ -7,10 +7,8 @@ AUX wine-proton-7.0.6-mingw64-11.0.0.patch 849 BLAKE2B 26833ef532e7c5b8b0ae14424 AUX wine-proton-8.0.1c-unwind.patch 1488 BLAKE2B 1a6d69484fb36f94f32d74679e809cfd7666363bede5dddedd2449e07251823b1ce86a717e06d342eec782aff501f27bc23433511c163da0b2a50c411df7ac53 SHA512 82ff0510fcab35471aa0db8f32f48cd62dbf78b3f5f36e3d191b86be55cb476df1ee689e5cd53c95d4f02199b5900eb0c8a45959693739a6c35e4c8b3cfa243f AUX wine-proton-8.0.4-restore-menubuilder.patch 382 BLAKE2B 04df3b2e495f49b4d66bc70a1198a3ab6c4dbb95c3ff145069b7086cf87de7233a1f5d6e56c861c0ff6f7e4b0869bb7ddf29a35ca9f32e47c05bf71fd0823ef3 SHA512 08bf5accb1ccf38519d5054c2d297da87aef0df5b5b5336d96e4b98a3af202ae8220c1e8cdf282c24b2706628e14a1afb7ff5f21f4a7a9f8e3f4f301f9e44c57 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef -DIST proton-wine-8.0-3c.tar.gz 48254135 BLAKE2B fee58928555376f71579099d3fb39dbe2242516b671af1ca2507a135c3119422d6e168ed2a258d29c57a8fc33a026e5cf788d8362f238f1c0c4c7c81c9cbb147 SHA512 5d473534834ce8ea855d4ee2d39f1596117c0abab0925ee50875245ff6e1f49fe4684fe6f162e92a4b5e408795ff8c9b15b382fb013074216dd565143ecd9efc DIST proton-wine-8.0-4.tar.gz 48317622 BLAKE2B 53047016897c8919cf3b51d7e51025806d267bb2f04fb3d464b8cf0f133c36b53d9c6c3e591aff4c71a95c6e167eed67b6ad84cc549e1aa1682175233da79835 SHA512 837772856aafb4d47c700997655c0d98f17cafdcc76008e04d064dd071e8d3163ed094bfc57441ef8ec4f2f7ea6303815351dc707ce5515f8c22f9aba8c5f83b -EBUILD wine-proton-7.0.6.ebuild 11521 BLAKE2B 4e19e8fd1a37866432d2e0c685d19ddb0ac0284ede24463b8f6fb76a54f46a63da3e80e54140a46a2d96c85fc595f71783449422d8cdb04db50ab147d695fcdf SHA512 c0f51993ec7d330f4eddf2a986e22811ec94f6a71f368ab2e6e05812dd203f5865507bcf6d568591b558f40a34a2458a51b93828de99895c8e5bc19ed99f9cf1 -EBUILD wine-proton-8.0.3c.ebuild 11850 BLAKE2B 3ed149c353ef93827412a0173c30384d70db9d6272c8293ee262fffa1a8450bba01d624443684c72b9e067b3b41d350c9e6196ca4730bc30c91bad8411e77e4e SHA512 bebb9c4ba1c05fe781f49b45afc1cb524368d1e8f85a7444e9376c168b954907af556b227ca29229ead22ea74a52712bc463d63393580b1c6041bfe5217cedf1 -EBUILD wine-proton-8.0.4.ebuild 11991 BLAKE2B cb09b33bc083d9e9b97010ddff7928ecbbf11d7e10d4757512ef72d1b3f24850e80c27b832f427c4cc9ff9306fc7b2ff530fe377c74d53679fc2a7a5c3093c48 SHA512 97dcdfb1b48427f711c3563c3bf6c40998ef2df62b11452f4218c77d5774c91dbab5a1ca2877500d69f2c3d9c5887866e9cac14a8a9972306d64a9cbcaa6c8ab -EBUILD wine-proton-8.0.9999.ebuild 12108 BLAKE2B d04f35c322bf3d5c76069e0eb24f7763030a61a69b9ff67da295875839fbb6e5831a4a695668d21b1cadf1532dd73fe0faaee7d4b3703d4180e8d549f89d8162 SHA512 b6e78552b83ffa58788ea2a99f65a8ba1fe84338150fcd7c1dcbd30f2681d82ec0aa2cb7bad43318e3b9488d4fc0c7712ca79fe33ffa9d497da88a60254ea297 +EBUILD wine-proton-7.0.6.ebuild 11515 BLAKE2B 0b732ddd53be2a168e311e14264f15513527aead5bab059f287b56c329fd7b281d1220b420e03afd67aadd6e23d23d2f05e011258ae6871082fc15ceb7cd5ecc SHA512 8d557d525b7cd2df84d0e0261e87a4ac900f8bdb34772728f6807c9e55b8158f83057f4eba77272b9b2c0c0664687dac087e32bbd11d019072fcd7a7eb11608d +EBUILD wine-proton-8.0.4.ebuild 11984 BLAKE2B 3973a69d2b14d349a1ed6b9ef006f67db44da377852a54130d58a5b2a8f920f571df74d829b32af856983adb78894b53f7da2c61c7db3e0a03f39c81ed0e0091 SHA512 1f06ca753a3cf377de8ba56bc282777544943262631c361e2fd08459ad16f2184d0ceef12e58227525fea40c934a1a5e2bcaf46ecd2c38a22e108e2d6609395c +EBUILD wine-proton-8.0.9999.ebuild 12102 BLAKE2B d3c620ddfa4716d03b01a387f6e39415005a1bdde2e6375dc05587ff33330af4277b5d91d71b42412a202ebfd4548a29efbab272f5c482ade3161b156a092b8e SHA512 0fd0f8d5ea5ad8c254aa37b6f8207685c4d2586d85ebe676c7f486480c5119013d2ac7475d278f270b25d940f0fdf3b1b203c117a918d9a81163d8042b4ca805 MISC metadata.xml 1222 BLAKE2B 75e8a33a16e4d718c5299ae719cdd009e9ac6f0d2eafb112c9e38e7d860a51d7f4d5be14912c1c812718b36fd4d71a9d3ddf2c68f5a076fc71f5d47fab120736 SHA512 3fc770b9d6f1e7cb7cba7fc28f90d5f51ad431f38e757dcb47b03543985d0919e29b6648b8c3f6bb6e1c7b172bb164cde35e2fea24564e476088c1a91e6131c8 diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild index 8ac2d2cc34a7..b0d8137fd450 100644 --- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild +++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -100,7 +100,7 @@ BDEPEND=" dev-lang/perl sys-devel/binutils sys-devel/bison - app-alternatives/lex + sys-devel/flex virtual/pkgconfig nls? ( sys-devel/gettext ) !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )" diff --git a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild deleted file mode 100644 index bd975980027b..000000000000 --- a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild +++ /dev/null @@ -1,363 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MULTILIB_COMPAT=( abi_x86_{32,64} ) -PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools flag-o-matic multilib multilib-build prefix -inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper - -WINE_GECKO=2.47.3 -WINE_MONO=7.4.1 -WINE_PV=$(ver_rs 2 -) - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git" - EGIT_BRANCH="experimental_$(ver_cut 1-2)" -else - SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz" - S="${WORKDIR}/${PN}-wine-${WINE_PV}" - KEYWORDS="-* amd64 ~x86" -fi - -DESCRIPTION="Valve Software's fork of Wine" -HOMEPAGE="https://github.com/ValveSoftware/wine/" - -LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff" -SLOT="${PV}" -IUSE=" - +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags - +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa - perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind - usb v4l +xcomposite xinerama" - -# tests are non-trivial to run, can hang easily, don't play well with -# sandbox, and several need real opengl/vulkan or network access -RESTRICT="test" - -# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked -WINE_DLOPEN_DEPEND=" - dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] - media-libs/freetype[${MULTILIB_USEDEP}] - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] ) - ssl? ( - dev-libs/gmp:=[${MULTILIB_USEDEP}] - net-libs/gnutls:=[${MULTILIB_USEDEP}] - ) - udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )" -# gcc: for -latomic with clang -WINE_COMMON_DEPEND=" - ${WINE_DLOPEN_DEPEND} - sys-devel/gcc:* - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[opengl,${MULTILIB_USEDEP}] - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - ) - pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) - udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) - unwind? ( - llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] ) - !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) - ) - usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )" -RDEPEND=" - ${WINE_COMMON_DEPEND} - app-emulation/wine-desktop-common - gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] ) - gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) - mono? ( app-emulation/wine-mono:${WINE_MONO} ) - perl? ( - dev-lang/perl - dev-perl/XML-LibXML - ) - selinux? ( sec-policy/selinux-wine ) - udisks? ( sys-fs/udisks:2 )" -DEPEND=" - ${WINE_COMMON_DEPEND} - sys-kernel/linux-headers - x11-base/xorg-proto" -BDEPEND=" - ${PYTHON_DEPS} - dev-lang/perl - sys-devel/binutils - sys-devel/bison - app-alternatives/lex - virtual/pkgconfig - nls? ( sys-devel/gettext ) - !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )" -IDEPEND=">=app-eselect/eselect-wine-2" - -QA_CONFIG_IMPL_DECL_SKIP=( - __clear_cache # unused on amd64+x86 (bug #900332) - res_getservers # false positive -) -QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext - -PATCHES=( - "${FILESDIR}"/${PN}-7.0.4-musl.patch - "${FILESDIR}"/${PN}-7.0.4-noexecstack.patch - "${FILESDIR}"/${PN}-7.0.4-restore-menubuilder.patch - "${FILESDIR}"/${PN}-8.0.1c-unwind.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} == binary ]] && return - - if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then - local mingw=-w64-mingw32 - for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do - if ! type -P ${mingw}-gcc >/dev/null; then - eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain" - eerror "yourself by installing sys-devel/crossdev then running:" - eerror - eerror " crossdev --target ${mingw}" - eerror - eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw" - eerror "--> Note that mingw builds are default for ${PN} even without this USE." - die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found" - fi - done - fi -} - -src_prepare() { - # sanity check, bumping these has a history of oversights - local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \ - dlls/appwiz.cpl/addons.c || die) - if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then - local gmfatal= - [[ ${PV} == *9999 ]] && gmfatal=nonfatal - ${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)" - fi - - default - - if tc-is-clang; then - # -mabi=ms was ignored by /dev/null) == mold* ]] && - append-ldflags -fuse-ld=bfd - - # build using upstream's way (--with-wine64) - # order matters: configure+compile 64->32, install 32->64 - local -i bits - for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do - ( - einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..." - - mkdir ../build${bits} || die - cd ../build${bits} || die - - pe_arch=i386 - if (( bits == 64 )); then - pe_arch=x86_64 - : "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}" - conf+=( --enable-win64 ) - elif use amd64; then - conf+=( - $(usev abi_x86_64 --with-wine64=../build64) - TARGETFLAGS=-m32 # for widl - ) - # _setup is optional, but use over Wine's auto-detect (+#472038) - multilib_toolchain_setup x86 - fi - : "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}" - - # CROSSCC is no longer recognized by Wine, but still use for now - # (future handling for CROSS* variables is subject to changes) - conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" ) - - # use *FLAGS for mingw, but strip unsupported - : "${CROSSCFLAGS:=$( - # >=wine-7.21 <8.10's configure.ac does not pass -fno-strict when - # it should (can be removed when proton is rebased on >=8.10) - append-cflags -fno-strict-aliasing - - filter-flags '-fstack-protector*' #870136 - filter-flags '-mfunction-return=thunk*' #878849 - - # -mavx with mingw-gcc has a history of obscure issues and - # disabling is seen as safer, e.g. `WINEARCH=win32 winecfg` - # crashes with -march=skylake >=wine-8.10, similar issues with - # znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273 - append-cflags -mno-avx #912268 - - CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" - : "${CROSSLDFLAGS:=$( - filter-flags '-fuse-ld=*' - CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}" - export CROSS{C,LD}FLAGS - - ECONF_SOURCE=${S} econf "${conf[@]}" - ) - done -} - -src_compile() { - use abi_x86_64 && emake -C ../build64 # do first - use abi_x86_32 && emake -C ../build32 -} - -src_install() { - use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install - use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last - - # symlink for plain 'wine' and install its man pages if 64bit-only #404331 - if use abi_x86_64 && use !abi_x86_32; then - dosym wine64 ${WINE_PREFIX}/bin/wine - dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader - local man - for man in ../build64/loader/wine.*man; do - : "${man##*/wine}" - : "${_%.*}" - insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1 - newins ${man} wine.1 - done - fi - - use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \ - "${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die - - # create variant wrappers for eselect-wine - local bin - for bin in "${ED}"${WINE_PREFIX}/bin/*; do - make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}" - done - - # don't let portage try to strip PE files with the wrong - # strip executable and instead handle it here (saves ~120MB) - dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows - - if use strip; then - ebegin "Stripping Windows (PE) binaries" - find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \ - -exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + - eend ${?} || die - fi - - dodoc ANNOUNCE AUTHORS README* documentation/README* - readme.gentoo_create_doc -} - -pkg_preinst() { - has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT= -} - -pkg_postinst() { - [[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog - - if use abi_x86_32 && has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]' - then - ewarn "x11-drivers/nvidia-drivers is installed but is built without" - ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" - ewarn "applications under ${PN} will likely not be usable." - fi - - eselect wine update --if-unset || die -} - -pkg_postrm() { - eselect wine update --if-unset || die -} diff --git a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild index 05a681ccecdb..cc16907c46de 100644 --- a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild +++ b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz" S="${WORKDIR}/${PN}-wine-${WINE_PV}" - KEYWORDS="-* ~amd64 ~x86" + KEYWORDS="-* amd64 ~x86" fi DESCRIPTION="Valve Software's fork of Wine" @@ -100,7 +100,7 @@ BDEPEND=" dev-lang/perl sys-devel/binutils sys-devel/bison - app-alternatives/lex + sys-devel/flex virtual/pkgconfig nls? ( sys-devel/gettext ) !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )" diff --git a/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild index 2e32a05cd485..0ee683445ce9 100644 --- a/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild +++ b/app-emulation/wine-proton/wine-proton-8.0.9999.ebuild @@ -101,7 +101,7 @@ BDEPEND=" dev-lang/perl sys-devel/binutils sys-devel/bison - app-alternatives/lex + sys-devel/flex virtual/pkgconfig nls? ( sys-devel/gettext ) !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )" -- cgit v1.2.3