From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9A60C13835B for ; Thu, 14 Jan 2021 23:50:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 483D6E084A; Thu, 14 Jan 2021 23:50:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A03B3E083E for ; Thu, 14 Jan 2021 23:50:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CB6C34017A for ; Thu, 14 Jan 2021 23:50:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 94DFF498 for ; Thu, 14 Jan 2021 23:50:22 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1610668212.4a3b86a27a74aa8d69684e6611f218bf5158e63e.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-staging/Manifest app-emulation/wine-staging/metadata.xml app-emulation/wine-staging/wine-staging-6.0.ebuild app-emulation/wine-staging/wine-staging-9999.ebuild X-VCS-Directories: app-emulation/wine-staging/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 4a3b86a27a74aa8d69684e6611f218bf5158e63e X-VCS-Branch: master Date: Thu, 14 Jan 2021 23:50:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 509ed036-77a0-416d-98f5-c4bae13437f4 X-Archives-Hash: b5063a07fc9d918b8f8b57ccbd10ab62 commit: 4a3b86a27a74aa8d69684e6611f218bf5158e63e Author: Nick Sarnie gentoo org> AuthorDate: Thu Jan 14 23:47:59 2021 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Thu Jan 14 23:50:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3b86a2 app-emulation/wine-staging: Sync with ::wine Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Nick Sarnie gentoo.org> app-emulation/wine-staging/Manifest | 2 + app-emulation/wine-staging/metadata.xml | 1 + ...staging-9999.ebuild => wine-staging-6.0.ebuild} | 119 +++++++++++---------- .../wine-staging/wine-staging-9999.ebuild | 119 +++++++++++---------- 4 files changed, 131 insertions(+), 110 deletions(-) diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index d8fca9b7a39..edb4bc4ca97 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -3,7 +3,9 @@ DIST wine-5.18.tar.xz 24160316 BLAKE2B 4f359b6e869707a514d2198d2b8ba810b8552ea53 DIST wine-5.20.tar.xz 24177960 BLAKE2B 50169bc00497feef91f5cf7fd56bce8f7784f70d2a24776494d0ab98cdb70b4387a92dece4571b2b22b15c42d82672595f39079a0678e551331f2bee4460f0f8 SHA512 30299287857376a827579335ba410d0575379df300860c8fdd50473f3eec074372d3602e5027f9e75fb13e272f28f51950ec652109839573a168aed23ba9c8f4 DIST wine-5.21.tar.xz 24178740 BLAKE2B 9d6b2766536fb019d69dbffc8dbae0004eeb6d5b3d3f57d0577b4952159b9a5388d1f767d982b3837d713175ac7baec47c7b017e21f4fb586d3d97707491066e SHA512 0879e4edeca60880799736ac831f8ae28c6e5156dde161685aa84a5d8bd20c4f3a51a178fa2b130a9e8af44432bb239160a04829fcef5d8332e2bbf829d2bc18 DIST wine-5.22.tar.xz 24214812 BLAKE2B 7bc093501cb20fbe52e277aadb867e4f55abc9898ae570aebf3496c2f7938129498e6ad8b6de7f8efe28ccffee734c94754da703e0c5d6bad6c1293cefb42c0e SHA512 9e86a1f74a142513121c155ffa5e1dd863ecc00092952878f44185725e81793fd7291e0e3c93275cd0d083d17af99eb1d8feba1c96e8607f44919b9045737271 +DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057 DIST wine-staging-5.18.tar.gz 10357038 BLAKE2B 07df0de55d1bfa36d3492498a48d8f1402dffa161f3b02f3326185d524bea9a2f0893b85a70650797bf1b74c06f5814ddc09cb184a5977cfacb968921020aee1 SHA512 75911ac4d5aaf6cfef41aa487290369d714f153b1fba2279daca75d6c5cbc7e7de9d3f8ef55eb7c311a05b86a212163e2b81ff685c1527fb0e90f223ec23dcab DIST wine-staging-5.20.tar.gz 10378427 BLAKE2B 75910b198ca5b79f41f4aa115a962cb01a4dd208512feffc2ef9bc327d9c82d0c0babd543ea011917257c5dfd7c5f2f2815dae81d553dd4b239b627bafba1635 SHA512 64913c3af44890a959593c610c713113f068811a8fe79e234a61f262af963d194d1d71d336361c6a473ad0f3f64fc5a88cee36facdc0824cea6856fc74da9634 DIST wine-staging-5.21.tar.gz 10362610 BLAKE2B 41f40c33b7d0853c63b81da863145f242b640a0e491b3ee92e1c687d33b85344676e764ae93921f00643b4bd3247e9c9aef4ba92cf80aa43785db1f762eac8cc SHA512 079a7fccd66d886b3498c45057b1bb215d3897e44e0c8d6afb56174fad583e8a578ea888d70d62a18da1566bb9649fdefd08227efecd21fc71b0b3d739dab636 DIST wine-staging-5.22.tar.gz 10342905 BLAKE2B 9f59a0d8c06f29b52fec71cc09915c8a7a23a1ad9945cedeced179657645970048846517f4eced051989b0ef1ee555c9f8176de073a66b3633f3fe1fd90e0836 SHA512 0ce0314b470e90c741fd02ede522b6dd754fb69595b527e3ad5ac62d944bc7eca43eca88aa2b85d99a9945fbad05872cdcd2ac87ed809dcd41a9ce56bfcc1147 +DIST wine-staging-6.0.tar.gz 9863425 BLAKE2B b51e0c3dc426c637de4ee89ee7d519847edcb04b1fb160f5f196e5560ce570ced682165ac74958433de79e104765d4811f004d323f357b753cf56108b9a631bb SHA512 33845e398e9c3d4bacbd9cd369983e72517fd648747433eabd933b446f9d86f1d61660959ff4e05cb661cf4038550b3df3384f588f3f5504b1f8056196ca3c38 diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml index 453fea4e770..d0c5202e160 100644 --- a/app-emulation/wine-staging/metadata.xml +++ b/app-emulation/wine-staging/metadata.xml @@ -46,6 +46,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset. Support GTK+:3 window theming through Wine-Staging Use virtual/libudev to provide plug and play support Use sys-libs/libunwind to unwind the stack + Use virtual/libusb to provide USB support Use app-emulation/vkd3d to provide Direct3D 12 support Enable Vulkan drivers diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-6.0.ebuild similarity index 88% copy from app-emulation/wine-staging/wine-staging-9999.ebuild copy to app-emulation/wine-staging/wine-staging-6.0.ebuild index ccde3bd8652..3eb6ecd117f 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,11 +7,11 @@ PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko PLOCALE_BACKUP="en" inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils - MY_PN="${PN%%-*}" -MY_P="${MY_PN}-${PV}" +MY_PV="${PV/_/-}" +MY_P="${MY_PN}-${MY_PV}" -if [[ ${PV} == "9999" ]] ; then +if [[ ${MY_PV} == "9999" ]] ; then EGIT_REPO_URI="https://source.winehq.org/git/wine.git" EGIT_BRANCH="master" inherit git-r3 @@ -19,12 +19,16 @@ if [[ ${PV} == "9999" ]] ; then #KEYWORDS="" else MAJOR_V=$(ver_cut 1) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" + MINOR_V=$(ver_cut 2) + if [[ ${MINOR_V} != "0" ]] ; then + MINOR_V="x" + fi + SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz" KEYWORDS="-* ~amd64 ~x86" fi S="${WORKDIR}/${MY_P}" -STAGING_P="wine-staging-${PV}" +STAGING_P="wine-staging-${MY_PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" GWP_V="20200523" PATCHDIR="${WORKDIR}/gentoo-wine-patches" @@ -35,16 +39,16 @@ SRC_URI="${SRC_URI} https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " -if [[ ${PV} == "9999" ]] ; then +if [[ ${MY_PV} == "9999" ]] ; then STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git" else SRC_URI="${SRC_URI} - staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" + staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )" fi LICENSE="LGPL-2.1" -SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +SLOT="${MY_PV}" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -112,6 +116,7 @@ COMMON_DEPEND=" udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) @@ -171,7 +176,7 @@ PATCHES=( PATCHES_BIN=() # https://bugs.gentoo.org/show_bug.cgi?id=635222 -if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then DEPEND+=" dev-util/patchbin" fi @@ -285,44 +290,46 @@ wine_env_vcs_vars() { } pkg_pretend() { - wine_build_environment_check || die + if [[ ${MERGE_TYPE} != binary ]] ; then + wine_build_environment_check || die + + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi + fi - # Verify OSS support - if use oss && ! use kernel_FreeBSD; then - if ! has_version ">=media-sound/oss-4"; then - eerror "You cannot build wine with USE=oss without having support from a" - eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then eerror - die + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target i686-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." fi - fi - if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then - eerror - eerror "USE=\"mingw\" is currently experimental, and requires the" - eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds." - eerror - eerror "These can be installed by using 'sys-devel/crossdev':" - eerror - eerror "crossdev --target i686-w64-mingw32" - eerror - eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" - eerror - die "MinGW build was enabled, but no compiler to support it was found." - fi - - if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then - eerror - eerror "USE=\"mingw\" is currently experimental, and requires the" - eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds." - eerror - eerror "These can be installed by using 'sys-devel/crossdev':" - eerror - eerror "crossdev --target x86_64-w64-mingw32" - eerror - eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" - eerror - die "MinGW build was enabled, but no compiler to support it was found." + if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then + eerror + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target x86_64-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." + fi fi } @@ -330,7 +337,7 @@ pkg_setup() { wine_build_environment_check || die wine_env_vcs_vars || die - WINE_VARIANT="${PN#wine}-${PV}" + WINE_VARIANT="${PN#wine}-${MY_PV}" WINE_VARIANT="${WINE_VARIANT#-}" MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" @@ -344,7 +351,7 @@ pkg_setup() { } src_unpack() { - if [[ ${PV} == "9999" ]] ; then + if [[ ${MY_PV} == "9999" ]] ; then EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack if use staging; then local CURRENT_WINE_COMMIT=${EGIT_VERSION} @@ -505,6 +512,7 @@ multilib_src_configure() { $(use_with truetype freetype) $(use_with udev) $(use_with unwind) + $(use_with usb) $(use_with v4l v4l2) $(use_with vkd3d) $(use_with vulkan) @@ -522,9 +530,10 @@ multilib_src_configure() { $(use_with vaapi va) ) - local PKG_CONFIG + local PKG_CONFIG AR RANLIB # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 - tc-export PKG_CONFIG + # set AR and RANLIB to make QA scripts happy; #483342 + tc-export PKG_CONFIG AR RANLIB if use amd64; then if [[ ${ABI} == amd64 ]]; then @@ -613,12 +622,12 @@ multilib_src_install_all() { } pkg_postinst() { - eselect wine register ${P} + eselect wine register ${PN}-${MY_PV} if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine register --vanilla ${P} || die + eselect wine register --vanilla ${PN}-${MY_PV} || die else if use staging; then - eselect wine register --staging ${P} || die + eselect wine register --staging ${PN}-${MY_PV} || die fi fi @@ -641,12 +650,12 @@ pkg_postinst() { } pkg_prerm() { - eselect wine deregister ${P} + eselect wine deregister ${PN}-${MY_PV} if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine deregister --vanilla ${P} || die + eselect wine deregister --vanilla ${PN}-${MY_PV} || die else if use staging; then - eselect wine deregister --staging ${P} || die + eselect wine deregister --staging ${PN}-${MY_PV}|| die fi fi diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index ccde3bd8652..3eb6ecd117f 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,11 +7,11 @@ PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko PLOCALE_BACKUP="en" inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils - MY_PN="${PN%%-*}" -MY_P="${MY_PN}-${PV}" +MY_PV="${PV/_/-}" +MY_P="${MY_PN}-${MY_PV}" -if [[ ${PV} == "9999" ]] ; then +if [[ ${MY_PV} == "9999" ]] ; then EGIT_REPO_URI="https://source.winehq.org/git/wine.git" EGIT_BRANCH="master" inherit git-r3 @@ -19,12 +19,16 @@ if [[ ${PV} == "9999" ]] ; then #KEYWORDS="" else MAJOR_V=$(ver_cut 1) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" + MINOR_V=$(ver_cut 2) + if [[ ${MINOR_V} != "0" ]] ; then + MINOR_V="x" + fi + SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz" KEYWORDS="-* ~amd64 ~x86" fi S="${WORKDIR}/${MY_P}" -STAGING_P="wine-staging-${PV}" +STAGING_P="wine-staging-${MY_PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" GWP_V="20200523" PATCHDIR="${WORKDIR}/gentoo-wine-patches" @@ -35,16 +39,16 @@ SRC_URI="${SRC_URI} https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " -if [[ ${PV} == "9999" ]] ; then +if [[ ${MY_PV} == "9999" ]] ; then STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git" else SRC_URI="${SRC_URI} - staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" + staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )" fi LICENSE="LGPL-2.1" -SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +SLOT="${MY_PV}" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -112,6 +116,7 @@ COMMON_DEPEND=" udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) @@ -171,7 +176,7 @@ PATCHES=( PATCHES_BIN=() # https://bugs.gentoo.org/show_bug.cgi?id=635222 -if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then DEPEND+=" dev-util/patchbin" fi @@ -285,44 +290,46 @@ wine_env_vcs_vars() { } pkg_pretend() { - wine_build_environment_check || die + if [[ ${MERGE_TYPE} != binary ]] ; then + wine_build_environment_check || die + + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi + fi - # Verify OSS support - if use oss && ! use kernel_FreeBSD; then - if ! has_version ">=media-sound/oss-4"; then - eerror "You cannot build wine with USE=oss without having support from a" - eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then eerror - die + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target i686-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." fi - fi - if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then - eerror - eerror "USE=\"mingw\" is currently experimental, and requires the" - eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds." - eerror - eerror "These can be installed by using 'sys-devel/crossdev':" - eerror - eerror "crossdev --target i686-w64-mingw32" - eerror - eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" - eerror - die "MinGW build was enabled, but no compiler to support it was found." - fi - - if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then - eerror - eerror "USE=\"mingw\" is currently experimental, and requires the" - eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds." - eerror - eerror "These can be installed by using 'sys-devel/crossdev':" - eerror - eerror "crossdev --target x86_64-w64-mingw32" - eerror - eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" - eerror - die "MinGW build was enabled, but no compiler to support it was found." + if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then + eerror + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target x86_64-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." + fi fi } @@ -330,7 +337,7 @@ pkg_setup() { wine_build_environment_check || die wine_env_vcs_vars || die - WINE_VARIANT="${PN#wine}-${PV}" + WINE_VARIANT="${PN#wine}-${MY_PV}" WINE_VARIANT="${WINE_VARIANT#-}" MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" @@ -344,7 +351,7 @@ pkg_setup() { } src_unpack() { - if [[ ${PV} == "9999" ]] ; then + if [[ ${MY_PV} == "9999" ]] ; then EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack if use staging; then local CURRENT_WINE_COMMIT=${EGIT_VERSION} @@ -505,6 +512,7 @@ multilib_src_configure() { $(use_with truetype freetype) $(use_with udev) $(use_with unwind) + $(use_with usb) $(use_with v4l v4l2) $(use_with vkd3d) $(use_with vulkan) @@ -522,9 +530,10 @@ multilib_src_configure() { $(use_with vaapi va) ) - local PKG_CONFIG + local PKG_CONFIG AR RANLIB # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 - tc-export PKG_CONFIG + # set AR and RANLIB to make QA scripts happy; #483342 + tc-export PKG_CONFIG AR RANLIB if use amd64; then if [[ ${ABI} == amd64 ]]; then @@ -613,12 +622,12 @@ multilib_src_install_all() { } pkg_postinst() { - eselect wine register ${P} + eselect wine register ${PN}-${MY_PV} if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine register --vanilla ${P} || die + eselect wine register --vanilla ${PN}-${MY_PV} || die else if use staging; then - eselect wine register --staging ${P} || die + eselect wine register --staging ${PN}-${MY_PV} || die fi fi @@ -641,12 +650,12 @@ pkg_postinst() { } pkg_prerm() { - eselect wine deregister ${P} + eselect wine deregister ${PN}-${MY_PV} if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine deregister --vanilla ${P} || die + eselect wine deregister --vanilla ${PN}-${MY_PV} || die else if use staging; then - eselect wine deregister --staging ${P} || die + eselect wine deregister --staging ${PN}-${MY_PV}|| die fi fi