git: e5b433425071 - main - emulators/wine: Unconditionally use SDL

The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e5b433425071d9d8d4afdeddb9d7c02aa20f84f8

commit e5b433425071d9d8d4afdeddb9d7c02aa20f84f8
Author:     Gerald Pfeifer <gerald@FreeBSD.org>
AuthorDate: 2021-10-17 16:28:05 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2021-10-17 16:28:05 +0000

    emulators/wine: Unconditionally use SDL
    
    Back port commit 3f4627fc27ad26876fdc440d51500c960f282751 from the
    wine-devel port:
    
    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
---
 emulators/wine/Makefile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 17d8397745a3..0ba0e3dc3093 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -21,8 +21,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
 
@@ -48,6 +50,7 @@ CONFIGURE_ARGS+=--verbose \
 		--with-oss \
 		--without-pulse \
 		--without-sane \
+		--with-sdl \
 		--without-tiff \
 		--without-udev \
 		--without-unwind \
@@ -64,13 +67,12 @@ SUB_FILES=	pkg-message
 
 PORTDATA=	wine.inf
 
-OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT MPG123 OPENAL SDL V4L VKD3D WINEMAKER X11 GECKO MONO
+OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT MPG123 OPENAL V4L VKD3D 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)
 VKD3D_DESC=	Vulkan and Direct3D 12 support
 WINEMAKER_DESC=	Fully support winemaker (requires Perl)
 GECKO_DESC=	Bundle Gecko MSI package for Wine
@@ -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
-
 V4L_CONFIGURE_WITH=	v4l2
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l