pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wine: Fix build for system with OSSv3



Module Name:	pkgsrc-wip
Committed By:	Frédéric Fauberteau <triaxx%NetBSD.org@localhost>
Pushed By:	frederic
Date:		Thu Jan 27 12:26:20 2022 +0100
Changeset:	e98c57faf4caa0ea56d7dbf24e000f99ecc13830

Modified Files:
	wine/Makefile
	wine/PLIST
	wine/PLIST.Linux

Log Message:
wine: Fix build for system with OSSv3

pkgsrc changes:
---------------
  * Arch Linux does not provide OSSv4. WINE checks if
    oss_sysinfo.numaudioengines is defined in soundcard.h.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e98c57faf4caa0ea56d7dbf24e000f99ecc13830

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wine/Makefile    | 2 ++
 wine/PLIST       | 6 ++++--
 wine/PLIST.Linux | 4 +---
 3 files changed, 7 insertions(+), 5 deletions(-)

diffs:
diff --git a/wine/Makefile b/wine/Makefile
index 1f2e2dd63d..e0e44fff10 100644
--- a/wine/Makefile
+++ b/wine/Makefile
@@ -59,6 +59,8 @@ CONFIGURE_ENV+=		ac_cv_cflags__Wl___enable_new_dtags=no
 CONFIGURE_ENV+=		wine_cv_linux_gethostbyname_r_6=no
 .endif
 
+# OSSv4 is required (oss_sysinfo.numaudioengies is cheched by configure)
+BUILTIN_FIND_GREP.H_SOUNDCARD=	numaudioengines
 .include "../../mk/oss.buildlink3.mk"
 
 .if ${OSS_TYPE} != "none"
diff --git a/wine/PLIST b/wine/PLIST
index 273e42ec0d..86f9a0665e 100644
--- a/wine/PLIST
+++ b/wine/PLIST
@@ -2242,6 +2242,7 @@ lib/wine/x86_64-unix/windows.media.devices.dll.so
 lib/wine/x86_64-unix/windows.media.speech.dll.so
 lib/wine/x86_64-unix/windowscodecs.dll.so
 lib/wine/x86_64-unix/windowscodecsext.dll.so
+${PLIST.alsa}lib/wine/x86_64-unix/winealsa.drv.so
 lib/wine/x86_64-unix/wineboot.exe.so
 lib/wine/x86_64-unix/winebrowser.exe.so
 lib/wine/x86_64-unix/winebus.so
@@ -2259,7 +2260,7 @@ lib/wine/x86_64-unix/winemapi.dll.so
 lib/wine/x86_64-unix/winemenubuilder.exe.so
 lib/wine/x86_64-unix/winemine.exe.so
 lib/wine/x86_64-unix/winemsibuilder.exe.so
-lib/wine/x86_64-unix/wineoss.drv.so
+${PLIST.oss}lib/wine/x86_64-unix/wineoss.drv.so
 lib/wine/x86_64-unix/winepath.exe.so
 lib/wine/x86_64-unix/wineps.drv.so
 lib/wine/x86_64-unix/wineusb.sys.so
@@ -3211,6 +3212,7 @@ lib/wine/x86_64-windows/windows.media.devices.dll
 lib/wine/x86_64-windows/windows.media.speech.dll
 lib/wine/x86_64-windows/windowscodecs.dll
 lib/wine/x86_64-windows/windowscodecsext.dll
+${PLIST.alsa}lib/wine/x86_64-windows/winealsa.drv
 lib/wine/x86_64-windows/wineboot.exe
 lib/wine/x86_64-windows/winebrowser.exe
 lib/wine/x86_64-windows/winebus.sys
@@ -3226,7 +3228,7 @@ lib/wine/x86_64-windows/winemapi.dll
 lib/wine/x86_64-windows/winemenubuilder.exe
 lib/wine/x86_64-windows/winemine.exe
 lib/wine/x86_64-windows/winemsibuilder.exe
-lib/wine/x86_64-windows/wineoss.drv
+${PLIST.oss}lib/wine/x86_64-windows/wineoss.drv
 lib/wine/x86_64-windows/winepath.exe
 lib/wine/x86_64-windows/wineps.drv
 lib/wine/x86_64-windows/wineusb.sys
diff --git a/wine/PLIST.Linux b/wine/PLIST.Linux
index e1aa4084e8..a9f4bec906 100644
--- a/wine/PLIST.Linux
+++ b/wine/PLIST.Linux
@@ -1,4 +1,2 @@
 @comment $NetBSD: PLIST.Linux,v 1.4 2014/01/17 09:01:58 adam Exp $
-bin/wine-preloader
-lib/wine/fakedlls/winejoystick.drv
-lib/wine/winejoystick.drv.so
+bin/wine64-preloader


Home | Main Index | Thread Index | Old Index