From 8ba493f5439ffec0ed21707f660602b7bd80bbbf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 3 Feb 2023 21:11:18 +0000 Subject: gentoo auto-resync : 03:02:2023 - 21:11:18 --- app-emulation/Manifest.gz | Bin 14815 -> 14811 bytes app-emulation/virtio-win/Manifest | 7 +- app-emulation/virtio-win/files/README.gentoo | 15 + .../virtio-win/virtio-win-0.1.221.1.ebuild | 12 +- .../virtio-win/virtio-win-0.1.225.2.ebuild | 12 +- .../virtio-win/virtio-win-0.1.229.1.ebuild | 12 +- app-emulation/wine-proton/Manifest | 6 +- app-emulation/wine-proton/wine-proton-7.0.5.ebuild | 4 +- app-emulation/wine-proton/wine-proton-7.0.6.ebuild | 321 +++++++++++++++++++++ .../wine-proton/wine-proton-7.0.9999.ebuild | 4 +- 10 files changed, 378 insertions(+), 15 deletions(-) create mode 100644 app-emulation/virtio-win/files/README.gentoo create mode 100644 app-emulation/wine-proton/wine-proton-7.0.6.ebuild (limited to 'app-emulation') diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index 59d0096392ad..44a58e2331af 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/virtio-win/Manifest b/app-emulation/virtio-win/Manifest index 3cbc12bea21f..55f32963ed40 100644 --- a/app-emulation/virtio-win/Manifest +++ b/app-emulation/virtio-win/Manifest @@ -1,7 +1,8 @@ +AUX README.gentoo 707 BLAKE2B 1a33b734540d0321aa91e4ad6b05f9f10b13fa2fdfe3ac28c2c54432bb5d0c773ae07e39c3c6e6e3da21b39f7b63d2df82ed1dd1d306133c2c0b9d407cfdffdc SHA512 42aa73f1a189521f67addfff3da3eb5ad6df81d5525284338812862dcd6f57b9be6af7625cec1a828318ac453de8d361480daf864a6cf32b713e316847bec722 DIST virtio-win-0.1.221.iso 531486720 BLAKE2B aa4914cf3a8298c7949b365a1f3e224c28eecc1a73897aec9c2a54d79976e6bcac5827b2c258e82f1faa86b2787e042e575003f6975ec11d875cf8ee2a4e184f SHA512 ee2608a4bb873911541cf884d1840845173e64b309fad23d744aaaa058d7c3ef8bf89fadf316d8d93363585402690923ffd6252660b4f609a439c561decfece0 DIST virtio-win-0.1.225.iso 532060160 BLAKE2B ed0fbf486f0c576bed25f02ea09cfd957a00a42d85063feb1dd2977e2cd816601fe2b013e00abbccf07eb765da3b64b88b5675c95175fdc971a20d784c28d503 SHA512 c0a940ca747983d88876f805f7266a8aae61b83857983738d06e9d555569d2b42a9cddb77d535b4f9dbc4b1099583f8b6844f13e4bd98ea1f0f6aec22c6c9be7 DIST virtio-win-0.1.229.iso 534818816 BLAKE2B 29442b70e5809fc935940497b4bc021f6fe890beba97605b048e0c5236764d08bc164974be25bf8331136ebbdf664ea440efe1f219129a30a171134bfe369942 SHA512 e9ccb513b07cb28ab490f5d4e299d0d52ade956f82e1a708e91c1ee3af9b142fa144af0fe5287d3bbb369f586857791952de45d1241058073f5a59c1f2f913ca -EBUILD virtio-win-0.1.221.1.ebuild 740 BLAKE2B 47313bcbf22ab470c55d1512f7ff20375be5d2e767f2e76b05e1bffe7c2f3951b3b2bd5029d8f9429b226a89905823fb70a2dafac8278726c50434a74325cd81 SHA512 5c8ed68bcafcd9ece47ca18a4ecd8e7d8252d920add0050dd039cb317e5bf747318104d69db85c3a58dd15ab48653ac41c10758cb25af4a1f89c0f19e4a620ad -EBUILD virtio-win-0.1.225.2.ebuild 740 BLAKE2B 47313bcbf22ab470c55d1512f7ff20375be5d2e767f2e76b05e1bffe7c2f3951b3b2bd5029d8f9429b226a89905823fb70a2dafac8278726c50434a74325cd81 SHA512 5c8ed68bcafcd9ece47ca18a4ecd8e7d8252d920add0050dd039cb317e5bf747318104d69db85c3a58dd15ab48653ac41c10758cb25af4a1f89c0f19e4a620ad -EBUILD virtio-win-0.1.229.1.ebuild 740 BLAKE2B 47313bcbf22ab470c55d1512f7ff20375be5d2e767f2e76b05e1bffe7c2f3951b3b2bd5029d8f9429b226a89905823fb70a2dafac8278726c50434a74325cd81 SHA512 5c8ed68bcafcd9ece47ca18a4ecd8e7d8252d920add0050dd039cb317e5bf747318104d69db85c3a58dd15ab48653ac41c10758cb25af4a1f89c0f19e4a620ad +EBUILD virtio-win-0.1.221.1.ebuild 858 BLAKE2B 5eb9258a937492dde09ad905011f76ec5a83a91d1422e4acb23cdf4ef9f178464b8ce86993009d1ca4be7640209d4bdd6d3c2f12799865eabc783fd9829844f6 SHA512 95a1e230a35a36097485e6fd24231940c7090b5f9d1a381e40803f00b9275db647f5b1969676f303f1afb5d81ca0af52da79fc1ba3bd24352c52d25ad2065b01 +EBUILD virtio-win-0.1.225.2.ebuild 858 BLAKE2B 5eb9258a937492dde09ad905011f76ec5a83a91d1422e4acb23cdf4ef9f178464b8ce86993009d1ca4be7640209d4bdd6d3c2f12799865eabc783fd9829844f6 SHA512 95a1e230a35a36097485e6fd24231940c7090b5f9d1a381e40803f00b9275db647f5b1969676f303f1afb5d81ca0af52da79fc1ba3bd24352c52d25ad2065b01 +EBUILD virtio-win-0.1.229.1.ebuild 858 BLAKE2B 5eb9258a937492dde09ad905011f76ec5a83a91d1422e4acb23cdf4ef9f178464b8ce86993009d1ca4be7640209d4bdd6d3c2f12799865eabc783fd9829844f6 SHA512 95a1e230a35a36097485e6fd24231940c7090b5f9d1a381e40803f00b9275db647f5b1969676f303f1afb5d81ca0af52da79fc1ba3bd24352c52d25ad2065b01 MISC metadata.xml 411 BLAKE2B a720d6789e46cf48d3d2a668b1edbc8bb6d6b837eebd19b1adfcc557dbb1313fccdd8fa174af0cc4e742c0d7f29d5f9ebef3de3e779819ab82a1ce8fc5635e27 SHA512 3729f816fad822a562ff5a8a1345c2ca20f990d35af5565008ef98370872ee0f313d0e89f0de27d08793a212737d6dd6662ce4c22b3c2a2bc43f7c8a69db46a4 diff --git a/app-emulation/virtio-win/files/README.gentoo b/app-emulation/virtio-win/files/README.gentoo new file mode 100644 index 000000000000..9c50feb9a1e8 --- /dev/null +++ b/app-emulation/virtio-win/files/README.gentoo @@ -0,0 +1,15 @@ +VirtIO drivers have been installed as a CD-ROM image to + + /usr/share/drivers/windows/virtio-win.iso + +To install the drivers on a Windows guest machine, either during or after the +installation of Windows, pass the iso file to the guest machine and mount it as +a CD-ROM image. Then, in the Windows guest, open the Device Manager and start +the driver update wizard. Locate the appropriate device and click to update its +driver. In the pop-up window, click to browse in the guest machine to locate +the iso image, and select the driver(s) from it to install. + +For an example, see: https://wiki.gentoo.org/wiki/QEMU/Windows_guest + +For information on using the Device Manager, refer to the Windows +documentation. diff --git a/app-emulation/virtio-win/virtio-win-0.1.221.1.ebuild b/app-emulation/virtio-win/virtio-win-0.1.221.1.ebuild index d86ab2c1a639..057b187a0c4b 100644 --- a/app-emulation/virtio-win/virtio-win-0.1.221.1.ebuild +++ b/app-emulation/virtio-win/virtio-win-0.1.221.1.ebuild @@ -3,6 +3,8 @@ EAPI=8 +inherit readme.gentoo-r1 + MY_PV=$(ver_cut 1-3) MY_DW=$(ver_rs 3 -) @@ -14,9 +16,15 @@ LICENSE="BSD Apache-2.0 GPL-2 GPL-2+ GPL-3+ LGPL-2+ Ms-RL" SLOT="0" KEYWORDS="~amd64" S="${WORKDIR}" +INSTALL_PATH=/usr/share/drivers/windows src_install() { - insinto /usr/share/drivers/windows + insinto "${INSTALL_PATH}" doins "${DISTDIR}/${PN}-${MY_PV}.iso" - dosym "${PN}-${MY_PV}.iso" "/usr/share/drivers/windows/${PN}.iso" + dosym "${PN}-${MY_PV}.iso" "${INSTALL_PATH}/${PN}.iso" + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog } diff --git a/app-emulation/virtio-win/virtio-win-0.1.225.2.ebuild b/app-emulation/virtio-win/virtio-win-0.1.225.2.ebuild index d86ab2c1a639..057b187a0c4b 100644 --- a/app-emulation/virtio-win/virtio-win-0.1.225.2.ebuild +++ b/app-emulation/virtio-win/virtio-win-0.1.225.2.ebuild @@ -3,6 +3,8 @@ EAPI=8 +inherit readme.gentoo-r1 + MY_PV=$(ver_cut 1-3) MY_DW=$(ver_rs 3 -) @@ -14,9 +16,15 @@ LICENSE="BSD Apache-2.0 GPL-2 GPL-2+ GPL-3+ LGPL-2+ Ms-RL" SLOT="0" KEYWORDS="~amd64" S="${WORKDIR}" +INSTALL_PATH=/usr/share/drivers/windows src_install() { - insinto /usr/share/drivers/windows + insinto "${INSTALL_PATH}" doins "${DISTDIR}/${PN}-${MY_PV}.iso" - dosym "${PN}-${MY_PV}.iso" "/usr/share/drivers/windows/${PN}.iso" + dosym "${PN}-${MY_PV}.iso" "${INSTALL_PATH}/${PN}.iso" + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog } diff --git a/app-emulation/virtio-win/virtio-win-0.1.229.1.ebuild b/app-emulation/virtio-win/virtio-win-0.1.229.1.ebuild index d86ab2c1a639..057b187a0c4b 100644 --- a/app-emulation/virtio-win/virtio-win-0.1.229.1.ebuild +++ b/app-emulation/virtio-win/virtio-win-0.1.229.1.ebuild @@ -3,6 +3,8 @@ EAPI=8 +inherit readme.gentoo-r1 + MY_PV=$(ver_cut 1-3) MY_DW=$(ver_rs 3 -) @@ -14,9 +16,15 @@ LICENSE="BSD Apache-2.0 GPL-2 GPL-2+ GPL-3+ LGPL-2+ Ms-RL" SLOT="0" KEYWORDS="~amd64" S="${WORKDIR}" +INSTALL_PATH=/usr/share/drivers/windows src_install() { - insinto /usr/share/drivers/windows + insinto "${INSTALL_PATH}" doins "${DISTDIR}/${PN}-${MY_PV}.iso" - dosym "${PN}-${MY_PV}.iso" "/usr/share/drivers/windows/${PN}.iso" + dosym "${PN}-${MY_PV}.iso" "${INSTALL_PATH}/${PN}.iso" + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog } diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest index 7d00bcca547e..f4942f8e700d 100644 --- a/app-emulation/wine-proton/Manifest +++ b/app-emulation/wine-proton/Manifest @@ -4,6 +4,8 @@ AUX wine-proton-7.0.4-noexecstack.patch 223 BLAKE2B dff1867e2977bd14fcfab9dfa2c2 AUX wine-proton-7.0.4-restore-menubuilder.patch 572 BLAKE2B 7ace97fb82498d8f19297cab205d8b9ca07c5293172a0b017b5d887ec1f5daeb3ed64eb0a322904e528a72f4a225813c27b544015587d71fce97c41b6b1463a2 SHA512 1384f06d4264e22d332eb12fabd7408b8e250e39c195460f876460fe40d35d617c73100815c395f481e3af66676ccaa1a14592c05f1e5b092bfafe2f87112106 AUX wine-proton-7.0.4-unwind.patch 1694 BLAKE2B 954cb0a395c3b45afc7a3f39f33d34cf041b9cf5a6c77d0a217d296c4c8d1f6503322c4f77188c4729b98318913b9bc86d37b7573713643590550297a0ae372a SHA512 f958e811a4754614bc9e7223f727e2c581c18607dccf14c6d7014012ff29107bd850540a40ff7a62e7bae6b87ae1ac28fd104fbbaf9ce954bf3acb38ddbeb7df DIST proton-wine-7.0-5.tar.gz 45724439 BLAKE2B d5ad4f00ca658b31c562c2ff4eb5ae33707126eee44ccfd9f33084ab5d184743034541efe3f9d18eb2a6941111da4c5134555f93769e8370b118b6f04e00ae1e SHA512 b16ace9c0bfa6d2685ea53617be2bba7e82c5c8da604f9e188bf782219785cfaed4317578c4314f2bde89d363a2e115f3bceeaa69d4a85f078a5fdb1ec64d33b -EBUILD wine-proton-7.0.5.ebuild 10396 BLAKE2B 658f810da3557b82cc801140916b07d5bd8397c8263042eb0e05b7b1d3f2808e36a87d62bcb5ee3efb3ef4231d65dee9370819d1d47915c11b697cdb1f309cae SHA512 bc2b2282a4df07325b8898b63ad2c356c9a6b4f1e637e95bacaacb715e77144775bdfd52e7164d432681b95a7f1f16818f64ac23401d3c67c4b75eb8d451c24e -EBUILD wine-proton-7.0.9999.ebuild 10397 BLAKE2B b19e8b4c01f3ab3ccd6ba3d8354be696062d5a5c868b50e60ca73a3c578705c15653e7ab2a826b62ad722f3f82c9978f5e7c7f5762b8a18ef4096ae3ee942d6c SHA512 3bf965ae956acbe38ca16bd25acdac80cd38c3fa7d76e4431aaf0300c823bb0658421c9c4bac90c20bbcf11d93420baa9bce0be1e2b8764ca7d62b0786a76e32 +DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef +EBUILD wine-proton-7.0.5.ebuild 10401 BLAKE2B 1c11f3665732f5217a52cfb3798f05eb9e2fa3f2c86a7ef8491a908accd0b3ef70375d7fffc24db452850e152f39e84b0d69d278333fa5a68da6b896b76f539a SHA512 90875a85b1704329d4119ce0e9ad1c6d2cac5b1d13ae8e5041bcb554b1937445ed4e26066dd49030b147b0470a275eb531193c28954415364bfa58719945751f +EBUILD wine-proton-7.0.6.ebuild 10402 BLAKE2B 824dfdeee1b05195443a45941ba06d13b674f3dd011ed66f0c0930d51d2a1ead5a9880975fe16ecd897533439ed86d0952d5a8fa81d85a0b832e49cfa060dd35 SHA512 5c8d55618fab8e7b9b049c84e1803ff890db473d1906c341196eb3e644b7d7ba21582159f96b79f8eb286ea3607adc7f070a13ba541e8deebb5536efe690c727 +EBUILD wine-proton-7.0.9999.ebuild 10402 BLAKE2B 824dfdeee1b05195443a45941ba06d13b674f3dd011ed66f0c0930d51d2a1ead5a9880975fe16ecd897533439ed86d0952d5a8fa81d85a0b832e49cfa060dd35 SHA512 5c8d55618fab8e7b9b049c84e1803ff890db473d1906c341196eb3e644b7d7ba21582159f96b79f8eb286ea3607adc7f070a13ba541e8deebb5536efe690c727 MISC metadata.xml 1222 BLAKE2B 75e8a33a16e4d718c5299ae719cdd009e9ac6f0d2eafb112c9e38e7d860a51d7f4d5be14912c1c812718b36fd4d71a9d3ddf2c68f5a076fc71f5d47fab120736 SHA512 3fc770b9d6f1e7cb7cba7fc28f90d5f51ad431f38e757dcb47b03543985d0919e29b6648b8c3f6bb6e1c7b172bb164cde35e2fea24564e476088c1a91e6131c8 diff --git a/app-emulation/wine-proton/wine-proton-7.0.5.ebuild b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild index 07870f389abe..1b2840143d98 100644 --- a/app-emulation/wine-proton/wine-proton-7.0.5.ebuild +++ b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild @@ -5,8 +5,8 @@ EAPI=8 MULTILIB_COMPAT=( abi_x86_{32,64} ) PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools flag-o-matic multilib multilib-build \ - python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper +inherit autotools flag-o-matic multilib multilib-build python-any-r1 +inherit readme.gentoo-r1 toolchain-funcs wrapper WINE_GECKO=2.47.3 WINE_MONO=7.3.1 diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild new file mode 100644 index 000000000000..ac7d38464311 --- /dev/null +++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild @@ -0,0 +1,321 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MULTILIB_COMPAT=( abi_x86_{32,64} ) +PYTHON_COMPAT=( python3_{9..11} ) +inherit autotools flag-o-matic multilib multilib-build python-any-r1 +inherit readme.gentoo-r1 toolchain-funcs wrapper + +WINE_GECKO=2.47.3 +WINE_MONO=7.4.0 +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 ZLIB gsm libpng2 libtiff" +SLOT="${PV}" +IUSE=" + +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags debug + +fontconfig +gecko +gstreamer llvm-libunwind +mono nls openal + osmesa perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb + v4l +vkd3d +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/gmp:=[${MULTILIB_USEDEP}] + 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? ( 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}] )" +WINE_COMMON_DEPEND=" + ${WINE_DLOPEN_DEPEND} + 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}] + ) + openal? ( media-libs/openal[${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}] ) + vkd3d? ( >=app-emulation/vkd3d-1.2[${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 + sys-devel/flex + virtual/pkgconfig + nls? ( sys-devel/gettext ) + !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )" +IDEPEND=">=app-eselect/eselect-wine-2" + +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}-7.0.4-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 + + # ensure .desktop calls this variant + slot + sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die + + # similarly to staging, append to `wine --version` for identification + sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die + + # always update for patches (including user's wrt #432348) + eautoreconf + tools/make_requests || die # perl + dlls/winevulkan/make_vulkan -x vk.xml || die # python, needed for proton's +} + +src_configure() { + WINE_PREFIX=/usr/lib/${P} + WINE_DATADIR=/usr/share/${P} + + local conf=( + --prefix="${EPREFIX}"${WINE_PREFIX} + --datadir="${EPREFIX}"${WINE_DATADIR} + --includedir="${EPREFIX}"/usr/include/${P} + --libdir="${EPREFIX}"${WINE_PREFIX} + --mandir="${EPREFIX}"${WINE_DATADIR}/man + + # upstream (Valve) doesn't really support misc configurations (e.g. + # adds vulkan code not always guarded by --with-vulkan), so force + # some major options that are typically needed by games either way + --with-freetype + --with-mingw # needed by many, notably Blizzard titles + --with-opengl + --with-vulkan + --with-x + + # ...and disable most options unimportant for games and unused by + # Proton rather than expose as volatile USEs with little support + --without-capi + --without-cups + --without-gphoto + --without-gssapi + --without-krb5 + --without-ldap + --without-netapi + --without-opencl + --without-pcap + --without-sane + ac_cv_lib_soname_odbc= + + $(use_enable gecko mshtml) + $(use_enable mono mscoree) + --disable-tests + $(use_with alsa) + $(use_with fontconfig) + $(use_with gstreamer) + $(use_with nls gettext) + $(use_with openal) + $(use_with osmesa) + --without-oss # media-sound/oss is not packaged (OSSv4) + $(use_with pulseaudio pulse) + $(use_with sdl) + $(use_with ssl gnutls) + $(use_with udev) + $(use_with udisks dbus) # dbus is only used for udisks + $(use_with unwind) + $(use_with usb) + $(use_with v4l v4l2) + $(use_with vkd3d) + $(use_with xcomposite) + $(use_with xinerama) + ) + + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime + use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} + + # temporary workaround for tc-ld-force-bfd not yet enforcing with mold + # https://github.com/gentoo/gentoo/pull/28355 + [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/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 + + # CROSSCC_amd64/x86 are unused by Wine, but recognized here for users + if (( bits == 64 )); then + : "${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}}" + + # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) + : "${CROSSCFLAGS:=$( + filter-flags '-fstack-clash-protection' #758914 + filter-flags '-fstack-protector*' #870136 + filter-flags '-mfunction-return=thunk*' #878849 + CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" + : "${CROSSLDFLAGS:=$( + filter-flags '-fuse-ld=*' + CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}" + export CROSS{CC,{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 + use debug || + find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \ + -exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die + + 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 + + eselect wine update --if-unset || die +} + +pkg_postrm() { + eselect wine update --if-unset || die +} diff --git a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild index d57544d5f001..ac7d38464311 100644 --- a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild +++ b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild @@ -5,8 +5,8 @@ EAPI=8 MULTILIB_COMPAT=( abi_x86_{32,64} ) PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools flag-o-matic multilib multilib-build \ - python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper +inherit autotools flag-o-matic multilib multilib-build python-any-r1 +inherit readme.gentoo-r1 toolchain-funcs wrapper WINE_GECKO=2.47.3 WINE_MONO=7.4.0 -- cgit v1.2.3