Page MenuHomeFreeBSD
Files F154292982

D50298.id.diff
No OneTemporary
Actions

D50298.id.diff
View Options

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -52,8 +52,7 @@
--without-sane \
--with-sdl \
--without-udev \
- --without-unwind \
- --without-usb
+ --without-unwind
CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex"
WINELIBDIR= ${PREFIX}/lib
.if !defined(USE_LDCONFIG32)
@@ -71,7 +70,7 @@
PORTDATA= wine.inf
-OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS V4L WAYLAND X11 GECKO MONO
+OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS V4L WAYLAND X11 GECKO MONO USB
OPTIONS_DEFAULT=ALSA GNUTLS X11
OPTIONS_RADIO= AUDIO
OPTIONS_RADIO_AUDIO= ALSA OSS
@@ -88,6 +87,8 @@
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_RUN_DEPENDS= alsa-plugins>0:audio/alsa-plugins
+USB_CONFIGURE_WITH= usb
+
CUPS_CONFIGURE_WITH= cups
CUPS_LIB_DEPENDS= libcups.so:print/cups
diff --git a/emulators/wine-devel/files/patch-configure b/emulators/wine-devel/files/patch-configure
--- a/emulators/wine-devel/files/patch-configure
+++ b/emulators/wine-devel/files/patch-configure
@@ -1,12 +1,29 @@
---- UTC
---- configure.orig 2024-08-10 14:38:54.000000000 +0000
-+++ configure 2024-08-10 23:43:05.264405000 +0000
-@@ -10662,7 +10662,7 @@
+--- configure.orig 2025-03-07 21:15:56 UTC
++++ configure
+@@ -10426,7 +10426,7 @@ fi
llvm_extra_ldflags=""
llvm_cflags=""
case $llvm_target in
- *windows) llvm_cflags="-Wl,-subsystem:console -Wl,-WX" ;;
+ *windows) llvm_cflags="-Wl,-subsystem:console" ;;
esac
- { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags --no-default-config" | $as_tr_sh`
+ { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags --no-default-config" | sed "$as_sed_sh"`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $llvm_extra_cflags $llvm_cflags --no-default-config" >&5
+@@ -17157,7 +17157,7 @@ fi
+ fi
+ fi
+
+-USB_LIBS=${USB_LIBS:-"-lusb-1.0"}
++USB_LIBS=${USB_LIBS:-"-lusb"}
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: libusb-1.0 cflags: $USB_CFLAGS" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: libusb-1.0 libs: $USB_LIBS" >&5
+ if test -s conftest.err; then
+@@ -17177,7 +17177,7 @@ else case e in #(
+ printf %s "(cached) " >&6
+ else case e in #(
+ e) ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lusb-1.0 $USB_LIBS $LIBS"
++LIBS="-lusb $USB_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -1644,6 +1644,7 @@
%%GSTREAMER%%lib/wine/%%WINEARCH%%-unix/winegstreamer.so
%%OSS%%lib/wine/%%WINEARCH%%-unix/wineoss.so
lib/wine/%%WINEARCH%%-unix/wineps.so
+%%USB%%lib/wine/%%WINEARCH%%-unix/wineusb.so
lib/wine/%%WINEARCH%%-unix/winevulkan.so
%%WAYLAND%%lib/wine/%%WINEARCH%%-unix/winewayland.so
%%X11%%lib/wine/%%WINEARCH%%-unix/winex11.so
@@ -2598,6 +2599,7 @@
lib/wine/%%WINEARCH%%-windows/wineps.drv
%%WINE32%%lib/wine/%%WINEARCH%%-windows/wineps16.drv16
%%WINE32%%lib/wine/%%WINEARCH%%-windows/winevdm.exe
+%%USB%%lib/wine/%%WINEARCH%%-windows/wineusb.sys
lib/wine/%%WINEARCH%%-windows/winevulkan.dll
%%WAYLAND%%lib/wine/%%WINEARCH%%-windows/winewayland.drv
%%X11%%lib/wine/%%WINEARCH%%-windows/winex11.drv

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 28, 4:01 PM (3 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32289789
Default Alt Text
D50298.id.diff (3 KB)

Event Timeline