summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2019-02-18 16:02:20 +0100
committerAvatar Timo Gurr <tgurr@exherbo.org> 2019-02-18 16:02:20 +0100
commit60e38ac9da467ee32723f2f95575eaa72cc8f2af (patch)
treeb4481aba34d2ef13be54ec9573d0cbc0cffac36f
parent3427a9c909d1b977195c0d88b96f2c1bcedfc97d (diff)
downloadvirtualization-master.tar.gz
virtualization-master.tar.xz
wine: cleanup exlibHEADmaster
-rw-r--r--packages/app-emulation/wine/wine.exlib60
1 files changed, 20 insertions, 40 deletions
diff --git a/packages/app-emulation/wine/wine.exlib b/packages/app-emulation/wine/wine.exlib
index 62870ba..f6d31f1 100644
--- a/packages/app-emulation/wine/wine.exlib
+++ b/packages/app-emulation/wine/wine.exlib
@@ -93,6 +93,7 @@ MYOPTIONS="
gsm [[ description = [ Support the GSM 06.10 codec for lossy speech compression ] ]]
gstreamer [[ description = [ Use GStreamer for codecs support ] ]]
isdn [[ description = [ Support for ISDN equipment in Wine using libcapi20 ] ]]
+ kerberos
lcms
ldap
mp3
@@ -104,23 +105,17 @@ MYOPTIONS="
pulseaudio
samba
scanner
+ sdl [[ description = [ Support for game controllers via SDL ] ]]
tiff
+ vkd3d [[
+ description = [ Support for the Direct3D 12 API ]
+ requires = [ vulkan ]
+ ]]
+ vulkan [[ description = [ Support for the Vulkan API ] ]]
+ kerberos? ( ( providers: heimdal krb5 ) [[ number-selected = exactly-one ]] )
( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]]
"
-if ever at_least 4.0 ; then
- MYOPTIONS+="
- kerberos
- sdl [[ description = [ Support for game controllers via SDL ] ]]
- vkd3d [[
- description = [ Support for the Direct3D 12 API ]
- requires = [ vulkan ]
- ]]
- vulkan [[ description = [ Support for the Vulkan API ] ]]
- kerberos? ( ( providers: heimdal krb5 ) [[ number-selected = exactly-one ]] )
- "
-fi
-
if [[ -n ${STAGING_PV} ]]; then
MYOPTIONS+="
ffmpeg [[ requires = [ staging ] description = [ Enable support for the WMA format conversion in XAudio2 utilizing FFmpeg ] ]]
@@ -167,6 +162,10 @@ DEPENDENCIES="
media-plugins/gst-plugins-base:1.0
)
isdn? ( dev-libs/libcapi20 )
+ kerberos? (
+ providers:heimdal? ( app-crypt/heimdal )
+ providers:krb5? ( app-crypt/krb5 )
+ )
lcms? ( media-libs/lcms2 )
ldap? ( net-directory/openldap )
mp3? ( media-sound/mpg123 )
@@ -182,24 +181,14 @@ DEPENDENCIES="
pulseaudio? ( media-sound/pulseaudio )
samba? ( net-fs/samba[>=3.0.25] )
scanner? ( media-gfx/sane-backends )
+ sdl? ( media-libs/SDL:2 )
tiff? ( media-libs/tiff )
+ vkd3d? ( app-emulation/vkd3d )
+ vulkan? ( sys-libs/vulkan-loader )
suggestion:
fonts/corefonts [[ description = [ Many Windows apps need the MS corefonts ] ]]
"
-if ever at_least 4.0 ; then
- DEPENDENCIES+="
- build+run:
- kerberos? (
- providers:heimdal? ( app-crypt/heimdal )
- providers:krb5? ( app-crypt/krb5 )
- )
- sdl? ( media-libs/SDL:2 )
- vkd3d? ( app-emulation/vkd3d )
- vulkan? ( sys-libs/vulkan-loader )
- "
-fi
-
if [[ -n ${STAGING_PV} ]]; then
DEPENDENCIES+="
build:
@@ -281,6 +270,8 @@ DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
gsm
gstreamer
"isdn capi"
+ "kerberos gssapi"
+ "kerberos krb5"
"lcms cms"
ldap
"mp3 mpg123"
@@ -293,23 +284,12 @@ DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
"pulseaudio pulse"
"samba netapi"
"scanner sane"
+ sdl
tiff
+ vkd3d
+ vulkan
)
-if ever at_least 4.0 ; then
- DEFAULT_SRC_CONFIGURE_OPTION_WITHS+=(
- 'kerberos gssapi'
- 'kerberos krb5'
- sdl
- vkd3d
- vulkan
- )
-else
- DEFAULT_SRC_CONFIGURE_PARAMS+=(
- --without-krb5
- )
-fi
-
if [[ -n ${STAGING_PV} ]]; then
DEFAULT_SRC_CONFIGURE_OPTION_WITHS+=(
ffmpeg