| 1 |
commit: 1205ce5a3b2aeb6cec6bd9025151f93373e6c15b |
| 2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 31 00:44:17 2020 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 31 00:47:41 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1205ce5a |
| 7 |
|
| 8 |
app-emulation/wine-vanilla: Sync with ::wine |
| 9 |
|
| 10 |
Add unwind USE |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.96, Repoman-2.3.22 |
| 13 |
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> |
| 14 |
|
| 15 |
app-emulation/wine-vanilla/metadata.xml | 1 + |
| 16 |
app-emulation/wine-vanilla/wine-vanilla-5.5.ebuild | 4 +++- |
| 17 |
app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 8 ++++++-- |
| 18 |
3 files changed, 10 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml |
| 21 |
index 359856c711d..03b00009d22 100644 |
| 22 |
--- a/app-emulation/wine-vanilla/metadata.xml |
| 23 |
+++ b/app-emulation/wine-vanilla/metadata.xml |
| 24 |
@@ -40,6 +40,7 @@ This variant of the Wine packaging does not include external patchsets |
| 25 |
(these pages are not currently in the updated WineHQ Wiki).</flag> |
| 26 |
<flag name="sdl">Add support for gamepad detection using SDL</flag> |
| 27 |
<flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> |
| 28 |
+ <flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> to unwind the stack</flag> |
| 29 |
<flag name="vkd3d">Use <pkg>app-emulation/vkd3d</pkg> to provide Direct3D 12 support</flag> |
| 30 |
<flag name="vulkan">Enable Vulkan drivers</flag> |
| 31 |
</use> |
| 32 |
|
| 33 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.5.ebuild |
| 34 |
index ab4b0c11da2..112cd56f007 100644 |
| 35 |
--- a/app-emulation/wine-vanilla/wine-vanilla-5.5.ebuild |
| 36 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.5.ebuild |
| 37 |
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} |
| 38 |
|
| 39 |
LICENSE="LGPL-2.1" |
| 40 |
SLOT="${PV}" |
| 41 |
-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" |
| 42 |
+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" |
| 43 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
| 44 |
X? ( truetype ) |
| 45 |
elibc_glibc? ( threads ) |
| 46 |
@@ -93,6 +93,7 @@ COMMON_DEPEND=" |
| 47 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
| 48 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
| 49 |
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
| 50 |
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) |
| 51 |
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) |
| 52 |
vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] ) |
| 53 |
vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) |
| 54 |
@@ -406,6 +407,7 @@ multilib_src_configure() { |
| 55 |
$(use_enable test tests) |
| 56 |
$(use_with truetype freetype) |
| 57 |
$(use_with udev) |
| 58 |
+ $(use_with unwind) |
| 59 |
$(use_with v4l v4l2) |
| 60 |
$(use_with vkd3d) |
| 61 |
$(use_with vulkan) |
| 62 |
|
| 63 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 64 |
index ce3a2cfa381..112cd56f007 100644 |
| 65 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 66 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 67 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 68 |
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" |
| 69 |
PLOCALE_BACKUP="en" |
| 70 |
|
| 71 |
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils |
| 72 |
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils |
| 73 |
|
| 74 |
MY_PN="${PN%%-*}" |
| 75 |
MY_P="${MY_PN}-${PV}" |
| 76 |
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} |
| 77 |
|
| 78 |
LICENSE="LGPL-2.1" |
| 79 |
SLOT="${PV}" |
| 80 |
-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" |
| 81 |
+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" |
| 82 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
| 83 |
X? ( truetype ) |
| 84 |
elibc_glibc? ( threads ) |
| 85 |
@@ -93,6 +93,7 @@ COMMON_DEPEND=" |
| 86 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
| 87 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
| 88 |
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
| 89 |
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) |
| 90 |
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) |
| 91 |
vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] ) |
| 92 |
vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) |
| 93 |
@@ -272,6 +273,7 @@ pkg_setup() { |
| 94 |
MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" |
| 95 |
MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" |
| 96 |
MY_DATADIR="${MY_DATAROOTDIR}" |
| 97 |
+ MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" |
| 98 |
MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" |
| 99 |
MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" |
| 100 |
MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" |
| 101 |
@@ -361,6 +363,7 @@ multilib_src_configure() { |
| 102 |
--prefix="${MY_PREFIX}" |
| 103 |
--datarootdir="${MY_DATAROOTDIR}" |
| 104 |
--datadir="${MY_DATADIR}" |
| 105 |
+ --docdir="${MY_DOCDIR}" |
| 106 |
--includedir="${MY_INCLUDEDIR}" |
| 107 |
--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" |
| 108 |
--libexecdir="${MY_LIBEXECDIR}" |
| 109 |
@@ -404,6 +407,7 @@ multilib_src_configure() { |
| 110 |
$(use_enable test tests) |
| 111 |
$(use_with truetype freetype) |
| 112 |
$(use_with udev) |
| 113 |
+ $(use_with unwind) |
| 114 |
$(use_with v4l v4l2) |
| 115 |
$(use_with vkd3d) |
| 116 |
$(use_with vulkan) |
Archives