From 1205ce5a3b2aeb6cec6bd9025151f93373e6c15b Mon Sep 17 00:00:00 2001 From: Nick Sarnie Date: Mon, 30 Mar 2020 20:44:17 -0400 Subject: [PATCH] app-emulation/wine-vanilla: Sync with ::wine Add unwind USE Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Nick Sarnie --- app-emulation/wine-vanilla/metadata.xml | 1 + app-emulation/wine-vanilla/wine-vanilla-5.5.ebuild | 4 +++- app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 8 ++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml index 359856c711db..03b00009d222 100644 --- a/app-emulation/wine-vanilla/metadata.xml +++ b/app-emulation/wine-vanilla/metadata.xml @@ -40,6 +40,7 @@ This variant of the Wine packaging does not include external patchsets (these pages are not currently in the updated WineHQ Wiki). Add support for gamepad detection using SDL Use virtual/libudev to provide plug and play support + Use sys-libs/libunwind to unwind the stack Use app-emulation/vkd3d to provide Direct3D 12 support Enable Vulkan drivers diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.5.ebuild index ab4b0c11da26..112cd56f0075 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-5.5.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-5.5.ebuild @@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -93,6 +93,7 @@ COMMON_DEPEND=" truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] ) vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) @@ -406,6 +407,7 @@ multilib_src_configure() { $(use_enable test tests) $(use_with truetype freetype) $(use_with udev) + $(use_with unwind) $(use_with v4l v4l2) $(use_with vkd3d) $(use_with vulkan) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index ce3a2cfa3815..112cd56f0075 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -6,7 +6,7 @@ EAPI=6 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils +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}" @@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -93,6 +93,7 @@ COMMON_DEPEND=" truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] ) vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) @@ -272,6 +273,7 @@ pkg_setup() { MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" MY_DATADIR="${MY_DATAROOTDIR}" + MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" @@ -361,6 +363,7 @@ multilib_src_configure() { --prefix="${MY_PREFIX}" --datarootdir="${MY_DATAROOTDIR}" --datadir="${MY_DATADIR}" + --docdir="${MY_DOCDIR}" --includedir="${MY_INCLUDEDIR}" --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" --libexecdir="${MY_LIBEXECDIR}" @@ -404,6 +407,7 @@ multilib_src_configure() { $(use_enable test tests) $(use_with truetype freetype) $(use_with udev) + $(use_with unwind) $(use_with v4l v4l2) $(use_with vkd3d) $(use_with vulkan) -- 2.26.2