wine: updated to version 1.7.10

From this release gentoo pulse patchet is used. Let's see how it works.
2025-01-23 17:33:34 +08:00 · 2014-01-06 15:10:23 +00:00 · 2014-01-06 15:10:23 +00:00 · adf79e325c
commit adf79e325c
parent 5ee9a3251d
2 changed files with 53 additions and 43 deletions
--- a/wine/PKGBUILD
+++ b/wine/PKGBUILD
@ -3,16 +3,18 @@
 # maintainer: Giuseppe Cala' <gcala[at]chakra-project[dot]org>

 pkgname=wine
-pkgver=1.7.9
+pkgver=1.7.10
 pkgrel=1
 _pkgbasever=${pkgver/rc/-rc}
 source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2
        30-win32-aliases.conf
-        wine-pulse-1.7.9.patch)
+        wine-pulse-1.7.10.patch
+        http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-$pkgver.tar.bz2)

-md5sums=('084d30aa42bc40f6472c3730bcf9c5ea'
+md5sums=('dc58a93457071b187e75c90ce74c069f'
         '1ff4e467f59409272088d92173a0f801'
-         'd2e7f5b72e98205e86ca7fa3d1daba61')
+         'e68beaa30225b0a1a7e75dadf324dec2'
+         'f3bede3db855f8f655921b9239bb91fc')

 pkgdesc="A compatibility layer for running Windows programs"
 url="http://www.winehq.com"
@ -86,6 +88,8 @@ optdepends=(
 build() {
  cd "$srcdir"
  
+  rm -rf $pkgname
+
  # Allow ccache to work
  mv $pkgname-$_pkgbasever $pkgname

@ -93,13 +97,18 @@ build() {
  sed -i 's|libncurses|libncursesw|g' "$srcdir/$pkgname/configure"
  sed -i 's|lncurses|lncursesw|g' "$srcdir/$pkgname/configure"
  
+#   cd $pkgname
+#   patch -Np1 -i ../wine-pulse-1.7.10.patch
+#   cd "$srcdir"
+
  cd $pkgname
-  patch -Np1 -i ../wine-pulse-1.7.9.patch
-  cd "$srcdir"
+  for _patch in $(ls $srcdir/winepulse-patches-$pkgver/*.patch) ; do    
+    patch -Np1 -i $_patch
+  done
+  cd $srcdir

  # Get rid of old build dirs
  rm -rf $pkgname-{32,64}-build
-  mkdir $pkgname-32-build

  # These additional CPPFLAGS solve FS#27662 and FS#34195
  export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
@ -126,12 +135,13 @@ build() {
  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"

  msg2 "Building Wine-32..."
+  mkdir "$srcdir/$pkgname-32-build"
  cd "$srcdir/$pkgname-32-build"
  ../$pkgname/configure \
    --prefix=/usr \
    --with-x \
-    --without-gstreamer \
    --with-pulse \
+    --without-gstreamer \
    "${_wine32opts[@]}"


--- a/wine/wine-pulse-1.7.10.patch
+++ b/wine/wine-pulse-1.7.10.patch
@ -1,7 +1,7 @@
-diff -Naur wine-1.7.9-orig/configure wine-1.7.9/configure
--- wine-1.7.9-orig/configure	2013-12-20 19:34:52.000000000 +0100
-+++ wine-1.7.9/configure	2013-12-29 10:39:42.270686167 +0100
-@@ -657,6 +657,8 @@
+diff -Naur wine-1.7.10-orig/configure wine-1.7.10/configure
+--- wine-1.7.10-orig/configure	2014-01-03 20:00:47.000000000 +0100
+++ wine-1.7.10/configure	2014-01-05 16:34:24.918169678 +0100
+@@ -653,6 +653,8 @@
 ALSALIBS
 GSTREAMER_LIBS
 GSTREAMER_CFLAGS
@ -10,7 +10,7 @@ diff -Naur wine-1.7.9-orig/configure wine-1.7.9/configure
 LIBGETTEXTPO
 ZLIB
 FREETYPE_LIBS
-@@ -835,6 +837,7 @@
+@@ -830,6 +832,7 @@
 with_oss
 with_png
 with_pthread
@ -18,7 +18,7 @@ diff -Naur wine-1.7.9-orig/configure wine-1.7.9/configure
 with_sane
 with_tiff
 with_v4l
-@@ -2048,6 +2051,7 @@
+@@ -2044,6 +2047,7 @@
   --without-oss           do not use the OSS sound support
   --without-png           do not use PNG
   --without-pthread       do not use the pthread library
@ -26,7 +26,7 @@ diff -Naur wine-1.7.9-orig/configure wine-1.7.9/configure
   --without-sane          do not use SANE (scanner support)
   --without-tiff          do not use TIFF
   --without-v4l           do not use v4l1 (v4l support)
-@@ -3283,6 +3287,12 @@
+@@ -3281,6 +3285,12 @@
 fi
 
 
@ -39,7 +39,7 @@ diff -Naur wine-1.7.9-orig/configure wine-1.7.9/configure
 # Check whether --with-sane was given.
 if test "${with_sane+set}" = set; then :
   withval=$with_sane;
-@@ -12199,6 +12209,87 @@
+@@ -12095,6 +12105,87 @@
 fi
 fi
 
@ -127,7 +127,7 @@ diff -Naur wine-1.7.9-orig/configure wine-1.7.9/configure
 if test "x$with_gstreamer" != "xno"
 then
     if test -n "$GSTREAMER_CFLAGS"; then :
-@@ -13536,12 +13627,13 @@
+@@ -13432,12 +13523,13 @@
 
 test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
 test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
@ -143,7 +143,7 @@ diff -Naur wine-1.7.9-orig/configure wine-1.7.9/configure
 then
     as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent."
 fi
-@@ -17303,6 +17395,7 @@
+@@ -17130,6 +17222,7 @@
 wine_fn_config_dll wineoss.drv enable_wineoss_drv
 wine_fn_config_dll wineps.drv enable_wineps_drv clean,po
 wine_fn_config_dll wineps16.drv16 enable_win16
@ -151,10 +151,10 @@ diff -Naur wine-1.7.9-orig/configure wine-1.7.9/configure
 wine_fn_config_dll wineqtdecoder enable_wineqtdecoder
 wine_fn_config_dll winex11.drv enable_winex11_drv
 wine_fn_config_dll wing.dll16 enable_win16
-diff -Naur wine-1.7.9-orig/configure.ac wine-1.7.9/configure.ac
--- wine-1.7.9-orig/configure.ac	2013-12-20 19:34:52.000000000 +0100
-+++ wine-1.7.9/configure.ac	2013-12-29 10:39:42.274021168 +0100
-@@ -68,6 +68,7 @@
+diff -Naur wine-1.7.10-orig/configure.ac wine-1.7.10/configure.ac
+--- wine-1.7.10-orig/configure.ac	2014-01-03 20:00:47.000000000 +0100
+++ wine-1.7.10/configure.ac	2014-01-05 16:34:24.921504678 +0100
+@@ -70,6 +70,7 @@
 AC_ARG_WITH(png,       AS_HELP_STRING([--without-png],[do not use PNG]))
 AC_ARG_WITH(pthread,   AS_HELP_STRING([--without-pthread],[do not use the pthread library]),
             [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi])
@ -162,7 +162,7 @@ diff -Naur wine-1.7.9-orig/configure.ac wine-1.7.9/configure.ac
 AC_ARG_WITH(sane,      AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
 AC_ARG_WITH(tiff,      AS_HELP_STRING([--without-tiff],[do not use TIFF]))
 AC_ARG_WITH(v4l,       AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)]))
-@@ -1529,6 +1530,30 @@
+@@ -1522,6 +1523,30 @@
           [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.])
 fi
 
@ -193,7 +193,7 @@ diff -Naur wine-1.7.9-orig/configure.ac wine-1.7.9/configure.ac
 dnl **** Check for gstreamer ****
 if test "x$with_gstreamer" != "xno"
 then
-@@ -1753,13 +1778,14 @@
+@@ -1746,13 +1771,14 @@
 dnl **** Disable unsupported winmm drivers ****
 test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
 test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
@ -210,7 +210,7 @@ diff -Naur wine-1.7.9-orig/configure.ac wine-1.7.9/configure.ac
 then
     WINE_WARNING([No sound system was found. Windows applications will be silent.])
 fi
-@@ -3259,6 +3285,7 @@
+@@ -3184,6 +3210,7 @@
 WINE_CONFIG_DLL(wineoss.drv)
 WINE_CONFIG_DLL(wineps.drv,,[clean,po])
 WINE_CONFIG_DLL(wineps16.drv16,enable_win16)
@ -218,9 +218,9 @@ diff -Naur wine-1.7.9-orig/configure.ac wine-1.7.9/configure.ac
 WINE_CONFIG_DLL(wineqtdecoder)
 WINE_CONFIG_DLL(winex11.drv)
 WINE_CONFIG_DLL(wing.dll16,enable_win16)
-diff -Naur wine-1.7.9-orig/dlls/mmdevapi/main.c wine-1.7.9/dlls/mmdevapi/main.c
--- wine-1.7.9-orig/dlls/mmdevapi/main.c	2013-12-20 19:34:52.000000000 +0100
-+++ wine-1.7.9/dlls/mmdevapi/main.c	2013-12-29 10:39:42.274021168 +0100
+diff -Naur wine-1.7.10-orig/dlls/mmdevapi/main.c wine-1.7.10/dlls/mmdevapi/main.c
+--- wine-1.7.10-orig/dlls/mmdevapi/main.c	2014-01-03 20:00:47.000000000 +0100
+++ wine-1.7.10/dlls/mmdevapi/main.c	2014-01-05 16:34:24.924839679 +0100
@@ -110,7 +110,7 @@
 {
     static const WCHAR drv_value[] = {'A','u','d','i','o',0};
@ -230,9 +230,9 @@ diff -Naur wine-1.7.9-orig/dlls/mmdevapi/main.c wine-1.7.9/dlls/mmdevapi/main.c
         'c','o','r','e','a','u','d','i','o',0};
 
     DriverFuncs driver;
-diff -Naur wine-1.7.9-orig/dlls/mmdevapi/tests/render.c wine-1.7.9/dlls/mmdevapi/tests/render.c
--- wine-1.7.9-orig/dlls/mmdevapi/tests/render.c	2013-12-20 19:34:52.000000000 +0100
-+++ wine-1.7.9/dlls/mmdevapi/tests/render.c	2013-12-29 10:39:42.287361166 +0100
+diff -Naur wine-1.7.10-orig/dlls/mmdevapi/tests/render.c wine-1.7.10/dlls/mmdevapi/tests/render.c
+--- wine-1.7.10-orig/dlls/mmdevapi/tests/render.c	2014-01-03 20:00:47.000000000 +0100
+++ wine-1.7.10/dlls/mmdevapi/tests/render.c	2014-01-05 16:34:24.924839679 +0100
@@ -477,6 +477,169 @@
     }
 }
@ -411,9 +411,9 @@ diff -Naur wine-1.7.9-orig/dlls/mmdevapi/tests/render.c wine-1.7.9/dlls/mmdevapi
     test_references();
     test_marshal();
     trace("Output to a MS-DOS console is particularly slow and disturbs timing.\n");
-diff -Naur wine-1.7.9-orig/dlls/winepulse.drv/Makefile.in wine-1.7.9/dlls/winepulse.drv/Makefile.in
--- wine-1.7.9-orig/dlls/winepulse.drv/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ wine-1.7.9/dlls/winepulse.drv/Makefile.in	2013-12-29 10:39:42.274021168 +0100
+diff -Naur wine-1.7.10-orig/dlls/winepulse.drv/Makefile.in wine-1.7.10/dlls/winepulse.drv/Makefile.in
+--- wine-1.7.10-orig/dlls/winepulse.drv/Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ wine-1.7.10/dlls/winepulse.drv/Makefile.in	2014-01-05 16:34:24.924839679 +0100
@@ -0,0 +1,9 @@
 +MODULE    = winepulse.drv
 +IMPORTS   = dxguid uuid winmm user32 advapi32 ole32
@ -424,9 +424,9 @@ diff -Naur wine-1.7.9-orig/dlls/winepulse.drv/Makefile.in wine-1.7.9/dlls/winepu
 +	mmdevdrv.c
 +
 +@MAKE_DLL_RULES@
-diff -Naur wine-1.7.9-orig/dlls/winepulse.drv/mmdevdrv.c wine-1.7.9/dlls/winepulse.drv/mmdevdrv.c
--- wine-1.7.9-orig/dlls/winepulse.drv/mmdevdrv.c	1970-01-01 01:00:00.000000000 +0100
-+++ wine-1.7.9/dlls/winepulse.drv/mmdevdrv.c	2013-12-29 10:39:42.290696166 +0100
+diff -Naur wine-1.7.10-orig/dlls/winepulse.drv/mmdevdrv.c wine-1.7.10/dlls/winepulse.drv/mmdevdrv.c
+--- wine-1.7.10-orig/dlls/winepulse.drv/mmdevdrv.c	1970-01-01 01:00:00.000000000 +0100
+++ wine-1.7.10/dlls/winepulse.drv/mmdevdrv.c	2014-01-05 16:34:24.924839679 +0100
@@ -0,0 +1,3221 @@
 +/*
 + * Copyright 2011-2012 Maarten Lankhorst
@ -3649,18 +3649,18 @@ diff -Naur wine-1.7.9-orig/dlls/winepulse.drv/mmdevdrv.c wine-1.7.9/dlls/winepul
 +    *out = &This->IAudioSessionManager2_iface;
 +    return S_OK;
 +}
-diff -Naur wine-1.7.9-orig/dlls/winepulse.drv/winepulse.drv.spec wine-1.7.9/dlls/winepulse.drv/winepulse.drv.spec
--- wine-1.7.9-orig/dlls/winepulse.drv/winepulse.drv.spec	1970-01-01 01:00:00.000000000 +0100
-+++ wine-1.7.9/dlls/winepulse.drv/winepulse.drv.spec	2013-12-29 10:39:42.284026167 +0100
+diff -Naur wine-1.7.10-orig/dlls/winepulse.drv/winepulse.drv.spec wine-1.7.10/dlls/winepulse.drv/winepulse.drv.spec
+--- wine-1.7.10-orig/dlls/winepulse.drv/winepulse.drv.spec	1970-01-01 01:00:00.000000000 +0100
+++ wine-1.7.10/dlls/winepulse.drv/winepulse.drv.spec	2014-01-05 16:34:24.924839679 +0100
@@ -0,0 +1,5 @@
 +# MMDevAPI driver functions
 +@ stdcall -private GetPriority() AUDDRV_GetPriority
 +@ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs
 +@ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint
 +@ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager
-diff -Naur wine-1.7.9-orig/dlls/winmm/lolvldrv.c wine-1.7.9/dlls/winmm/lolvldrv.c
--- wine-1.7.9-orig/dlls/winmm/lolvldrv.c	2013-12-20 19:34:52.000000000 +0100
-+++ wine-1.7.9/dlls/winmm/lolvldrv.c	2013-12-29 10:39:42.254011168 +0100
+diff -Naur wine-1.7.10-orig/dlls/winmm/lolvldrv.c wine-1.7.10/dlls/winmm/lolvldrv.c
+--- wine-1.7.10-orig/dlls/winmm/lolvldrv.c	2014-01-03 20:00:47.000000000 +0100
+++ wine-1.7.10/dlls/winmm/lolvldrv.c	2014-01-05 16:34:24.928174679 +0100
@@ -544,7 +544,10 @@
     drvA = HeapAlloc(GetProcessHeap(), 0, size);
     WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, drvA, size, NULL, NULL);