From 09fcd562eb42a945ea4ada79d1ae3b3460b0d5b0 Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Wed, 3 Nov 2021 07:25:05 +0000 Subject: emulators/wine-devel: Account for further bundled libs Since version 6.20 Wine bundles and unconditionally uses copies of the gsm, jxr, tiff and xslt libraries. Accordingly, the --without-gsm, --without-jxrlib, and --without-tiff configure options we have been using became no-ops, so remove those. Also remove the LIBXSLT option, which was off by default before that bundling, and associated logic. (None of these simplifications should change generated packages.) Approved by: maintainer (pre-approval) --- emulators/wine-devel/Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index fa39752a0ace..0a017bb39fd7 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -41,10 +41,8 @@ CONFIGURE_ARGS+=--verbose \ --without-dbus \ --without-gettext --without-gettextpo \ --without-gphoto \ - --without-gsm \ --without-gstreamer \ --without-inotify \ - --without-jxrlib \ --without-krb5 \ --without-mingw \ --without-opencl \ @@ -53,7 +51,6 @@ CONFIGURE_ARGS+=--verbose \ --without-pulse \ --without-sane \ --with-sdl \ - --without-tiff \ --without-udev \ --without-unwind \ --without-usb @@ -69,12 +66,11 @@ SUB_FILES= pkg-message PORTDATA= wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT OPENAL STAGING V4L WINEMAKER X11 GECKO MONO +OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP 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) STAGING_DESC= Include Wine Staging patchset (experimental&unsupported) WINEMAKER_DESC= Fully support winemaker (requires Perl) GECKO_DESC= Bundle Gecko MSI package for Wine @@ -93,9 +89,6 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes -LIBXSLT_CONFIGURE_WITH= xslt -LIBXSLT_LIB_DEPENDS= libxslt.so:textproc/libxslt - MONO_RUN_DEPENDS= wine-mono-devel>0:emulators/wine-mono-devel OPENAL_CONFIGURE_WITH= openal -- cgit v1.2.3