git: 89f7712ef739 - main - emulators/wine-devel: Fix pkg-plist for OSS and i386

From: Gerald Pfeifer <gerald_at_FreeBSD.org>
Date: Mon, 24 Jun 2024 07:45:36 UTC
The branch main has been updated by gerald:

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

commit 89f7712ef739f5658db476c8f93c06a3aac3e7d5
Author:     Gerald Pfeifer <gerald@FreeBSD.org>
AuthorDate: 2024-06-24 07:44:53 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2024-06-24 07:44:54 +0000

    emulators/wine-devel: Fix pkg-plist for OSS and i386
    
    With the large update to Wine 9.9 we missed the (non-default) OSS option
    and its impact on packaging. [1]
    
    Similarly, i386 does not feature the WoW64 libraries. [2]
    
    PR:             279927
    Co-authored-by: scf [2]
    Reported by:    O. Hartmann <ohartmann@walstatt.org> [1], scf [2]
    Tested by:      Ivan Rozhuk <rozhuk.im@gmail.com> [1], scf
---
 emulators/wine-devel/pkg-plist | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 192fa6519569..8b072e67c619 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -1554,7 +1554,7 @@ lib/wine/%%WINEARCH%%-unix/libwmcodecdspuuid.a
 lib/wine/%%WINEARCH%%-unix/libwmvcore.a
 lib/wine/%%WINEARCH%%-unix/libwnaspi32.a
 %%WINE32%%lib/wine/%%WINEARCH%%-unix/libwow32.a
-lib/wine/%%WINEARCH%%-unix/libwow64.a
+%%WINE64%%lib/wine/%%WINEARCH%%-unix/libwow64.a
 lib/wine/%%WINEARCH%%-unix/libws2_32.a
 lib/wine/%%WINEARCH%%-unix/libwsdapi.a
 lib/wine/%%WINEARCH%%-unix/libwsnmp32.a
@@ -1575,9 +1575,7 @@ lib/wine/%%WINEARCH%%-unix/secur32.so
 lib/wine/%%WINEARCH%%-unix/win32u.so
 %%ALSA%%lib/wine/%%WINEARCH%%-unix/winealsa.so
 lib/wine/%%WINEARCH%%-unix/winebus.so
-%%GSTREAMER%%lib/wine/%%WINEARCH%%-unix/winegstreamer.dll.so
 %%GSTREAMER%%lib/wine/%%WINEARCH%%-unix/winegstreamer.so
-%%OSS%%lib/wine/%%WINEARCH%%-unix/wineoss.drv.so
 %%OSS%%lib/wine/%%WINEARCH%%-unix/wineoss.so
 lib/wine/%%WINEARCH%%-unix/wineps.so
 lib/wine/%%WINEARCH%%-unix/winevulkan.so
@@ -2084,7 +2082,7 @@ lib/wine/%%WINEARCH%%-windows/libwldap32.a
 lib/wine/%%WINEARCH%%-windows/libwmcodecdspuuid.a
 lib/wine/%%WINEARCH%%-windows/libwmvcore.a
 lib/wine/%%WINEARCH%%-windows/libwnaspi32.a
-lib/wine/%%WINEARCH%%-windows/libwow64.a
+%%WINE64%%lib/wine/%%WINEARCH%%-windows/libwow64.a
 lib/wine/%%WINEARCH%%-windows/libws2_32.a
 lib/wine/%%WINEARCH%%-windows/libwsdapi.a
 lib/wine/%%WINEARCH%%-windows/libwsnmp32.a
@@ -2535,9 +2533,9 @@ lib/wine/%%WINEARCH%%-windows/wnaspi32.dll
 lib/wine/%%WINEARCH%%-windows/wofutil.dll
 lib/wine/%%WINEARCH%%-windows/wordpad.exe
 %%WINE32%%lib/wine/%%WINEARCH%%-windows/wow32.dll
-lib/wine/%%WINEARCH%%-windows/wow64.dll
-lib/wine/%%WINEARCH%%-windows/wow64cpu.dll
-lib/wine/%%WINEARCH%%-windows/wow64win.dll
+%%WINE64%%lib/wine/%%WINEARCH%%-windows/wow64.dll
+%%WINE64%%lib/wine/%%WINEARCH%%-windows/wow64cpu.dll
+%%WINE64%%lib/wine/%%WINEARCH%%-windows/wow64win.dll
 lib/wine/%%WINEARCH%%-windows/wpc.dll
 lib/wine/%%WINEARCH%%-windows/write.exe
 lib/wine/%%WINEARCH%%-windows/ws2_32.dll