From nobody Sun Oct 17 16:28:29 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 066D3180563F; Sun, 17 Oct 2021 16:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HXQRd6hn5z3hx6; Sun, 17 Oct 2021 16:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C26FB10625; Sun, 17 Oct 2021 16:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19HGSTQD022743; Sun, 17 Oct 2021 16:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19HGSTpO022742; Sun, 17 Oct 2021 16:28:29 GMT (envelope-from git) Date: Sun, 17 Oct 2021 16:28:29 GMT Message-Id: <202110171628.19HGSTpO022742@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: e5b433425071 - main - emulators/wine: Unconditionally use SDL List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5b433425071d9d8d4afdeddb9d7c02aa20f84f8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=e5b433425071d9d8d4afdeddb9d7c02aa20f84f8 commit e5b433425071d9d8d4afdeddb9d7c02aa20f84f8 Author: Gerald Pfeifer AuthorDate: 2021-10-17 16:28:05 +0000 Commit: Gerald Pfeifer 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