CVS commit: pkgsrc/emulators/wine

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat May 23 21:20:39 UTC 2020

Modified Files:
        pkgsrc/emulators/wine: Makefile PLIST PLIST.Darwin distinfo
        pkgsrc/emulators/wine/patches: patch-configure
            patch-programs_wineconsole_curses.c

Log Message:
wine: make it build on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 pkgsrc/emulators/wine/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/emulators/wine/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/wine/PLIST.Darwin
cvs rdiff -u -r1.94 -r1.95 pkgsrc/emulators/wine/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/wine/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/wine/patches/patch-programs_wineconsole_curses.c

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

Modified files:

Index: pkgsrc/emulators/wine/Makefile
diff -u pkgsrc/emulators/wine/Makefile:1.214 pkgsrc/emulators/wine/Makefile:1.215
--- pkgsrc/emulators/wine/Makefile:1.214        Fri May 22 19:48:34 2020
+++ pkgsrc/emulators/wine/Makefile      Sat May 23 21:20:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.214 2020/05/22 19:48:34 nia Exp $
+# $NetBSD: Makefile,v 1.215 2020/05/23 21:20:38 adam Exp $
 
 DISTNAME=      wine-4.0.3
 CATEGORIES=    emulators
@@ -36,7 +36,8 @@ CONFIGURE_ARGS+=      --without-vulkan
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=           lp32 lp64
+PLIST_VARS+=           desktop lp32 lp64 oss
+
 .if ${MACHINE_ARCH} == "x86_64"
 PLIST.lp64=            yes
 CONFIGURE_ARGS+=       --enable-win64
@@ -57,7 +58,6 @@ CONFIGURE_ENV+=               wine_cv_linux_gethostby
 
 .include "../../mk/oss.buildlink3.mk"
 
-PLIST_VARS+=           oss
 .if ${OSS_TYPE} != "none"
 PLIST.oss=             yes
 LDFLAGS+=              ${LIBOSSAUDIO}
@@ -73,6 +73,14 @@ CONFIGURE_ARGS+=     --without-oss
 # Fix warning due to _FORTIFY_SOURCE being redefined
 CONFIGURE_ENV+=                ac_cv_c_fortify_enabled=no
 
+# Wine will use system frameworks on Darwin.
+.if ${OPSYS} != "Darwin"
+PLIST.desktop= yes
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.endif
+
 .include "options.mk"
 .include "../../audio/faudio/buildlink3.mk"
 .include "../../audio/gsm/buildlink3.mk"
@@ -81,9 +89,7 @@ CONFIGURE_ENV+=               ac_cv_c_fortify_enabled
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
@@ -91,7 +97,6 @@ CONFIGURE_ENV+=               ac_cv_c_fortify_enabled
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"

Index: pkgsrc/emulators/wine/PLIST
diff -u pkgsrc/emulators/wine/PLIST:1.70 pkgsrc/emulators/wine/PLIST:1.71
--- pkgsrc/emulators/wine/PLIST:1.70    Fri May 22 17:44:41 2020
+++ pkgsrc/emulators/wine/PLIST Sat May 23 21:20:38 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.70 2020/05/22 17:44:41 nia Exp $
+@comment $NetBSD: PLIST,v 1.71 2020/05/23 21:20:38 adam Exp $
 bin/function_grep.pl
 bin/msiexec
 bin/notepad
@@ -2165,7 +2165,7 @@ lib/wine/fakedlls/winemapi.dll
 lib/wine/fakedlls/winemenubuilder.exe
 lib/wine/fakedlls/winemine.exe
 lib/wine/fakedlls/winemsibuilder.exe
-lib/wine/fakedlls/wineoss.drv
+${PLIST.oss}lib/wine/fakedlls/wineoss.drv
 lib/wine/fakedlls/winepath.exe
 lib/wine/fakedlls/wineps.drv
 ${PLIST.pulse}lib/wine/fakedlls/winepulse.drv
@@ -2780,7 +2780,7 @@ lib/wine/winemapi.dll.so
 lib/wine/winemenubuilder.exe.so
 lib/wine/winemine.exe.so
 lib/wine/winemsibuilder.exe.so
-lib/wine/wineoss.drv.so
+${PLIST.oss}lib/wine/wineoss.drv.so
 lib/wine/winepath.exe.so
 lib/wine/wineps.drv.so
 ${PLIST.pulse}lib/wine/winepulse.drv.so
@@ -2883,7 +2883,7 @@ man/man1/winepath.1
 man/man1/wineserver.1
 man/man1/wmc.1
 man/man1/wrc.1
-share/applications/wine.desktop
+${PLIST.desktop}share/applications/wine.desktop
 share/wine/fonts/coue1255.fon
 share/wine/fonts/coue1256.fon
 share/wine/fonts/coue1257.fon

Index: pkgsrc/emulators/wine/PLIST.Darwin
diff -u pkgsrc/emulators/wine/PLIST.Darwin:1.3 pkgsrc/emulators/wine/PLIST.Darwin:1.4
--- pkgsrc/emulators/wine/PLIST.Darwin:1.3      Fri May 22 17:44:41 2020
+++ pkgsrc/emulators/wine/PLIST.Darwin  Sat May 23 21:20:38 2020
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST.Darwin,v 1.3 2020/05/22 17:44:41 nia Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.4 2020/05/23 21:20:38 adam Exp $
+bin/wine64-preloader
 lib/wine/fakedlls/winecoreaudio.drv
-lib/wine/fakedlls/winemp3.acm
-lib/wine/fakedlls/wineqtdecoder.dll
-lib/wine/fakedlls/winequartz.drv
+lib/wine/fakedlls/winejoystick.drv
+lib/wine/fakedlls/winemac.drv
 lib/wine/winecoreaudio.drv.so
-lib/wine/winemp3.acm.so
-lib/wine/wineqtdecoder.dll.so
-lib/wine/winequartz.drv.so
+lib/wine/winejoystick.drv.so
+lib/wine/winemac.drv.so

Index: pkgsrc/emulators/wine/distinfo
diff -u pkgsrc/emulators/wine/distinfo:1.94 pkgsrc/emulators/wine/distinfo:1.95
--- pkgsrc/emulators/wine/distinfo:1.94 Fri May 22 19:48:34 2020
+++ pkgsrc/emulators/wine/distinfo      Sat May 23 21:20:38 2020
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.94 2020/05/22 19:48:34 nia Exp $
+$NetBSD: distinfo,v 1.95 2020/05/23 21:20:38 adam Exp $
 
 SHA1 (wine-4.0.3.tar.xz) = c8d19a0ee0cb7b5f9b45ef4b8441990b8976dcf8
 RMD160 (wine-4.0.3.tar.xz) = 347dab2714272e4ef36f397cdbc52c5b95ea211a
 SHA512 (wine-4.0.3.tar.xz) = a8fde0bcf600eaec56c3ce58c9aa992386784c85cf1c93aa84d50aff4c842b12a6b099c23391d3ad9a0059f3dc9069c0f8e00fad293305ba8a33afc70bf26e14
 Size (wine-4.0.3.tar.xz) = 21680420 bytes
-SHA1 (patch-configure) = 5dda8249ec5533b4bbe5d735df33491452acc078
+SHA1 (patch-configure) = c326ade452067d50504a546d2a9b81c822b14ec9
 SHA1 (patch-dlls_ntdll_thread.c) = 8a13e956e6622cc215fbe6e9943a704b3a926168
 SHA1 (patch-dlls_wininet_http.c) = 9e539ed70a5bf010e50c7beb1c3b3c877ed5e5d8
-SHA1 (patch-include_bcrypt.h) = 77ea288bac8ab9dccb23e831c083b0229bbb669d
 SHA1 (patch-programs_wineconsole_Makefile.in) = 73f274eef6759accc0dfae5d5de21c76573b8e7b
-SHA1 (patch-programs_wineconsole_curses.c) = 644b0d665a045113ed15a1cd4a70c67ff08b5eb6
+SHA1 (patch-programs_wineconsole_curses.c) = 195be3c65bc272b0e8412d108d75ee3100dc18d9

Index: pkgsrc/emulators/wine/patches/patch-configure
diff -u pkgsrc/emulators/wine/patches/patch-configure:1.2 pkgsrc/emulators/wine/patches/patch-configure:1.3
--- pkgsrc/emulators/wine/patches/patch-configure:1.2   Fri May 22 17:44:42 2020
+++ pkgsrc/emulators/wine/patches/patch-configure       Sat May 23 21:20:39 2020
@@ -1,15 +1,24 @@
-$NetBSD: patch-configure,v 1.2 2020/05/22 17:44:42 nia Exp $
+$NetBSD: patch-configure,v 1.3 2020/05/23 21:20:39 adam Exp $
 
 pkgsrc doesn't use lib64.
+On Darwin, do not use @rpath.
 
---- configure.orig     2019-03-15 20:18:31.000000000 +0000
+--- configure.orig     2019-11-25 15:10:40.000000000 +0000
 +++ configure
-@@ -5683,7 +5683,7 @@ if test "x$enable_win64" = "xyes"
+@@ -5654,7 +5654,6 @@ if test "x$enable_win64" = "xyes"
  then
      test -z "$with_wine64" || as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive.
  --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5
 -    test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
-+    #test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
  fi
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the directory containing the Wine tools" >&5
+@@ -8947,7 +8946,7 @@ fi
+ 
+     LIBWINE_SHAREDLIB="libwine.$libwine_version.dylib"
+ 
+-    LIBWINE_LDFLAGS="-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"
++    LIBWINE_LDFLAGS="-dynamiclib -install_name ${libdir}/libwine.$libwine_soversion.dylib -compatibility_version $libwine_soversion -current_version $libwine_version"
+ 
+     WINELOADER_DEPENDS="wine_info.plist"
+ 

Index: pkgsrc/emulators/wine/patches/patch-programs_wineconsole_curses.c
diff -u pkgsrc/emulators/wine/patches/patch-programs_wineconsole_curses.c:1.1 pkgsrc/emulators/wine/patches/patch-programs_wineconsole_curses.c:1.2
--- pkgsrc/emulators/wine/patches/patch-programs_wineconsole_curses.c:1.1       Fri May 22 17:44:42 2020
+++ pkgsrc/emulators/wine/patches/patch-programs_wineconsole_curses.c   Sat May 23 21:20:39 2020
@@ -1,24 +1,30 @@
-$NetBSD: patch-programs_wineconsole_curses.c,v 1.1 2020/05/22 17:44:42 nia Exp $
+$NetBSD: patch-programs_wineconsole_curses.c,v 1.2 2020/05/23 21:20:39 adam Exp $
 
 _acs_map in NetBSD curses is the equivalent of acs_map in ncurses.
 
---- programs/wineconsole/curses.c.orig 2019-03-15 20:18:31.000000000 +0000
+--- programs/wineconsole/curses.c.orig 2019-11-25 15:10:40.000000000 +0000
 +++ programs/wineconsole/curses.c
-@@ -125,7 +125,7 @@ MAKE_FUNCPTR(getmouse)
+@@ -125,7 +125,11 @@ MAKE_FUNCPTR(getmouse)
  MAKE_FUNCPTR(mouseinterval)
  MAKE_FUNCPTR(mousemask)
  #endif
--MAKE_FUNCPTR(acs_map)
++#ifdef __NetBSD__
 +MAKE_FUNCPTR(_acs_map)
++#else
+ MAKE_FUNCPTR(acs_map)
++#endif
  
  #undef MAKE_FUNCPTR
  
-@@ -189,7 +189,7 @@ static BOOL WCCURSES_bind_libcurses(void
+@@ -189,7 +193,11 @@ static BOOL WCCURSES_bind_libcurses(void
      LOAD_FUNCPTR(mouseinterval)
      LOAD_FUNCPTR(mousemask)
  #endif
--    LOAD_FUNCPTR(acs_map)
++#ifdef __NetBSD__
 +    LOAD_FUNCPTR(_acs_map)
++#else
+     LOAD_FUNCPTR(acs_map)
++#endif
  
  #undef LOAD_FUNCPTR