Skip to content

Commit

Permalink
emulators/wine-devel: Unconditionally use SDL
Browse files Browse the repository at this point in the history
SDL2 is indirectly pulled in via our (unconditional) FAudio dependency
anyway, so always use it, remove the SDL option, and simplify the port
accordingly.

PR:		258375
  • Loading branch information
Gerald Pfeifer authored and Gerald Pfeifer committed Sep 28, 2021
1 parent 2fb798e commit 3f4627f
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions emulators/wine-devel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex
LIB_DEPENDS= libFAudio.so:audio/faudio \
libxml2.so:textproc/libxml2

USES= bison cpe desktop-file-utils gmake localbase pkgconfig shebangfix tar:xz
USES= bison cpe desktop-file-utils gmake localbase \
pkgconfig sdl shebangfix tar:xz
USE_GCC= yes
USE_SDL= sdl2

CPE_VENDOR= winehq

Expand All @@ -50,6 +52,7 @@ CONFIGURE_ARGS+=--verbose \
--with-oss \
--without-pulse \
--without-sane \
--with-sdl \
--without-tiff \
--without-udev \
--without-unwind \
Expand All @@ -66,13 +69,12 @@ SUB_FILES= pkg-message

PORTDATA= wine.inf

OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT MPG123 OPENAL SDL STAGING V4L WINEMAKER X11 GECKO MONO
OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT MPG123 OPENAL STAGING V4L WINEMAKER X11 GECKO MONO
OPTIONS_DEFAULT=GNUTLS OPENAL X11
OPTIONS_SUB= yes

DOSBOX_DESC= Use DOSBox to run MS-DOS programs
LIBXSLT_DESC= Use libxslt (only used by msxml3.dll)
SDL_DESC= Use SDL for gamepad support (XInput only)
STAGING_DESC= Include Wine Staging patchset (experimental&unsupported)
WINEMAKER_DESC= Fully support winemaker (requires Perl)
GECKO_DESC= Bundle Gecko MSI package for Wine
Expand Down Expand Up @@ -102,10 +104,6 @@ MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123
OPENAL_CONFIGURE_WITH= openal
OPENAL_USES= openal

SDL_CONFIGURE_WITH= sdl
SDL_USES= sdl
SDL_USE= SDL=sdl2

STAGING_MASTER_SITES= https://github.com/wine-staging/wine-staging/archive/:staging
STAGING_DIST= v${DISTVERSION}.tar.gz
STAGING_DISTFILES= ${STAGING_DIST}:staging
Expand Down

0 comments on commit 3f4627f

Please sign in to comment.