Fixed PulseAudio driver pthread dependency for upstream Wine 1.7.12.

README.md

@@ -2,3 +2,17 @@ wine-compholio-daily
 ====================
 
 Daily updates for the Wine "Compholio" Edition.
+
+Current patches include:
+* Support for interface change notifications (http://bugs.winehq.org/show_bug.cgi?id=32328)
+* Support for stored file ACLs (http://bugs.winehq.org/show_bug.cgi?id=31858)
+* Support for Junction Points (http://bugs.winehq.org/show_bug.cgi?id=12401)
+* Support for TransmitFile (http://bugs.winehq.org/show_bug.cgi?id=5048)
+* Support for access security with named pipes (http://bugs.winehq.org/show_bug.cgi?id=34098)
+* Support for GetVolumePathName
+* Allow CompareStringEx flag NORM_LINGUISTIC_CASING (http://bugs.winehq.org/show_bug.cgi?id=34269)
+* Workaround for TransactNamedPipe not being supported (http://bugs.winehq.org/show_bug.cgi?id=17273)
+* XEMBED support for embedding Wine windows inside Linux applications
+* Reduced SetTimer minimum value from 15 ms to 5 ms (improves Silverlight framerates)
+* Workaround for shlwapi URLs with relative paths
+* Support for PulseAudio backend for audio

debian/changelog

@@ -1,3 +1,26 @@
+wine-compholio (1.7.12-1) unstable; urgency=low
+  * Fixed PulseAudio patches to apply with 'git am'.
+  * Fixed PulseAudio driver configure file for upstream Wine 1.7.12.
+  * Fixed PulseAudio driver pthread dependency for upstream Wine 1.7.12.
+ -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 07 Feb 2014 17:52:32 -0700
+
+wine-compholio (1.7.12) unstable; urgency=low
+  * Added new patches to support GetVolumePathName.
+ -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 07 Feb 2014 14:57:33 -0700
+
+wine-compholio (1.7.11) unstable; urgency=low
+  * Added SRWLock patch.
+  * Added new patches to support TransmitFile.
+  * Added new patches to support Junction Points.
+  * Moved pipelight-specific patches to a separate folder.
+  * Removed SRWLock patch included in upstream Wine 1.7.11.
+  * Reduced SetTimer minimum limitation from 15 ms to 5 ms.
+  * Added support for security access parameters for named pipes.
+  * Added WINE_STRICT_DRAW_ORDERING command line environment variable.
+  * Fixed a path length bug in the ACL inheritance patch (assumed DOS limitation).
+  * Added some workarounds for shlwapi url functions not handling relative paths well.
+ -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 17 Jan 2014 12:27:32 -0700
+
 wine-compholio (1.7.10) unstable; urgency=low
   * Removed monitor enumeration patch included in upstream Wine 1.7.10.
   * Updated SIO_ADDRESS_LIST_CHANGE patch with latest proposed version.

debian/rules

@@ -76,7 +76,8 @@ endif
 	# Configure
 	CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/wine-compholio --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(CONFFLAGS)
 
-
+	# Update the wineserver protocol request data
+	./tools/make_requests
 
 build: build-stamp
 
@@ -119,7 +120,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 #	dh_installchangelogs ChangeLog
-	dh_installdocs
+#	dh_installdocs
 	dh_installexamples
 #	dh_install
 #	dh_installmenu

patches/01-Address_Change_Notification/0003-ws2_32-Add-an-interactive-test-for-interface-change-.patch

@@ -8,10 +8,10 @@ Subject: ws2_32: Add an interactive test for interface change notifications.
  1 file changed, 68 insertions(+)
 
 diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
-index ac6ee10..b6da0e7 100644
+index 0abf732..4703e59 100644
 --- a/dlls/ws2_32/tests/sock.c
 +++ b/dlls/ws2_32/tests/sock.c
-@@ -6225,6 +6225,73 @@ static void test_sioRoutingInterfaceQuery(void)
+@@ -6487,6 +6487,73 @@ static void test_sioRoutingInterfaceQuery(void)
      closesocket(sock);
  }
  
@@ -85,14 +85,14 @@ index ac6ee10..b6da0e7 100644
  static void test_synchronous_WSAIoctl(void)
  {
      HANDLE previous_port, io_port;
-@@ -7101,6 +7168,7 @@ START_TEST( sock )
+@@ -7570,6 +7637,7 @@ START_TEST( sock )
      test_ConnectEx();
  
      test_sioRoutingInterfaceQuery();
 +    test_sioAddressListChange();
  
-     test_WSAAsyncGetServByPort();
-     test_WSAAsyncGetServByName();
+     test_WSALookupService();
+ 
 -- 
 1.7.9.5
 

patches/02-ACL_Extended_Attributes/0001-server-Store-and-return-security-attributes-with-ext.patch

@@ -1,6 +1,6 @@
-From 78a5ebb94f3717bedd77f7c096e8fce1e9a640d1 Mon Sep 17 00:00:00 2001
+From acc6aac3356b0ec9024362488016945b76f67111 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Mon, 18 Nov 2013 18:12:05 -0700
+Date: Sat, 11 Jan 2014 09:18:16 -0700
 Subject: server: Store and return security attributes with extended file
  attributes.
 
@@ -14,10 +14,10 @@ Subject: server: Store and return security attributes with extended file
  6 files changed, 269 insertions(+), 22 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 98a73f2..bb03667 100644
+index dcabb55..fc8bd5c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -71,6 +71,7 @@ AC_ARG_WITH(pthread,   AS_HELP_STRING([--without-pthread],[do not use the pthrea
+@@ -73,6 +73,7 @@ AC_ARG_WITH(pthread,   AS_HELP_STRING([--without-pthread],[do not use the pthrea
  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)]))
@@ -25,7 +25,7 @@ index 98a73f2..bb03667 100644
  AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
              [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
  AC_ARG_WITH(xcursor,   AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]),
-@@ -666,6 +667,11 @@ AC_CHECK_HEADERS([libprocstat.h],,,
+@@ -665,6 +666,11 @@ AC_CHECK_HEADERS([libprocstat.h],,,
  #include <sys/socket.h>
  #endif])
  
@@ -38,10 +38,10 @@ index 98a73f2..bb03667 100644
  
  AC_SUBST(dlldir,"\${libdir}/wine")
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index fe31b5c..7d28c05 100644
+index 2efe80e..297cf96 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
-@@ -3088,10 +3088,10 @@ static void test_CreateDirectoryA(void)
+@@ -3105,10 +3105,10 @@ static void test_CreateDirectoryA(void)
          bret = pGetAce(pDacl, 0, (VOID **)&ace);
          ok(bret, "Failed to get Current User ACE.\n");
          bret = EqualSid(&ace->SidStart, user_sid);
@@ -56,7 +56,7 @@ index fe31b5c..7d28c05 100644
          ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n",
                                    ace->Mask);
      }
-@@ -3100,10 +3100,10 @@ static void test_CreateDirectoryA(void)
+@@ -3117,10 +3117,10 @@ static void test_CreateDirectoryA(void)
          bret = pGetAce(pDacl, 1, (VOID **)&ace);
          ok(bret, "Failed to get Administators Group ACE.\n");
          bret = EqualSid(&ace->SidStart, admin_sid);
@@ -71,7 +71,7 @@ index fe31b5c..7d28c05 100644
          ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n",
                                    ace->Mask);
      }
-@@ -3277,7 +3277,7 @@ static void test_GetNamedSecurityInfoA(void)
+@@ -3294,7 +3294,7 @@ static void test_GetNamedSecurityInfoA(void)
          bret = pGetAce(pDacl, 0, (VOID **)&ace);
          ok(bret, "Failed to get Current User ACE.\n");
          bret = EqualSid(&ace->SidStart, user_sid);
@@ -80,7 +80,7 @@ index fe31b5c..7d28c05 100644
          ok(((ACE_HEADER *)ace)->AceFlags == 0,
             "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
          ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n",
-@@ -3288,8 +3288,7 @@ static void test_GetNamedSecurityInfoA(void)
+@@ -3305,8 +3305,7 @@ static void test_GetNamedSecurityInfoA(void)
          bret = pGetAce(pDacl, 1, (VOID **)&ace);
          ok(bret, "Failed to get Administators Group ACE.\n");
          bret = EqualSid(&ace->SidStart, admin_sid);
@@ -90,7 +90,7 @@ index fe31b5c..7d28c05 100644
          ok(((ACE_HEADER *)ace)->AceFlags == 0,
             "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
          ok(ace->Mask == 0x1f01ff || broken(ace->Mask == GENERIC_ALL) /* win2k */,
-@@ -3943,7 +3942,7 @@ static void test_GetSecurityInfo(void)
+@@ -3960,7 +3959,7 @@ static void test_GetSecurityInfo(void)
          bret = pGetAce(pDacl, 0, (VOID **)&ace);
          ok(bret, "Failed to get Current User ACE.\n");
          bret = EqualSid(&ace->SidStart, user_sid);
@@ -99,7 +99,7 @@ index fe31b5c..7d28c05 100644
          ok(((ACE_HEADER *)ace)->AceFlags == 0,
             "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
          ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n",
-@@ -3954,7 +3953,7 @@ static void test_GetSecurityInfo(void)
+@@ -3971,7 +3970,7 @@ static void test_GetSecurityInfo(void)
          bret = pGetAce(pDacl, 1, (VOID **)&ace);
          ok(bret, "Failed to get Administators Group ACE.\n");
          bret = EqualSid(&ace->SidStart, admin_sid);

patches/02-ACL_Extended_Attributes/0002-ntdll-Inherit-security-attributes-from-parent-direct.patch

@@ -1,18 +1,18 @@
-From 5e49f53a4bd591e67c9b7c4fdaf46933e319f9aa Mon Sep 17 00:00:00 2001
+From b5efc991444e6539adf73f42b44e333b8aa7de2f Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Mon, 18 Nov 2013 18:15:20 -0700
+Date: Mon, 13 Jan 2014 18:32:05 -0700
 Subject: ntdll: Inherit security attributes from parent directories.
 
 ---
  dlls/advapi32/tests/security.c |   40 ++++++++++++++++++-
- dlls/ntdll/file.c              |   85 +++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 123 insertions(+), 2 deletions(-)
+ dlls/ntdll/file.c              |   83 +++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 121 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 7d28c05..a8d136b 100644
+index 297cf96..4b1c5a2 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
-@@ -3013,10 +3013,11 @@ static void test_CreateDirectoryA(void)
+@@ -3030,10 +3030,11 @@ static void test_CreateDirectoryA(void)
      ACL_SIZE_INFORMATION acl_size;
      ACCESS_ALLOWED_ACE *ace;
      SECURITY_ATTRIBUTES sa;
@@ -25,7 +25,7 @@ index 7d28c05..a8d136b 100644
      DWORD error;
      PACL pDacl;
  
-@@ -3108,6 +3109,43 @@ static void test_CreateDirectoryA(void)
+@@ -3125,6 +3126,43 @@ static void test_CreateDirectoryA(void)
                                    ace->Mask);
      }
  
@@ -70,10 +70,10 @@ index 7d28c05..a8d136b 100644
      HeapFree(GetProcessHeap(), 0, user);
      bret = RemoveDirectoryA(tmpdir);
 diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
-index 1de2c61..8948bb7 100644
+index d2efcc1..bdcaab4 100644
 --- a/dlls/ntdll/file.c
 +++ b/dlls/ntdll/file.c
-@@ -103,6 +103,81 @@ mode_t FILE_umask = 0;
+@@ -103,6 +103,79 @@ mode_t FILE_umask = 0;
  
  static const WCHAR ntfsW[] = {'N','T','F','S'};
  
@@ -86,10 +86,10 @@ index 1de2c61..8948bb7 100644
 +{
 +    SECURITY_INFORMATION info = OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION
 +                                |DACL_SECURITY_INFORMATION|SACL_SECURITY_INFORMATION;
++    WCHAR *p, parent[UNICODE_STRING_MAX_CHARS];
 +    PSECURITY_DESCRIPTOR parentsd = NULL;
 +    ACL_SIZE_INFORMATION acl_size;
 +    BOOLEAN present, defaulted;
-+    WCHAR *p, parent[MAX_PATH];
 +    OBJECT_ATTRIBUTES pattr;
 +    UNICODE_STRING parentW;
 +    IO_STATUS_BLOCK io;
@@ -102,11 +102,9 @@ index 1de2c61..8948bb7 100644
 +    parentW.Buffer = parent;
 +    parentW.Length = filenameW->Length;
 +    memcpy(parentW.Buffer, filenameW->Buffer, filenameW->Length);
-+    if ((p = strrchrW(parent, '\\')) != NULL)
-+    {
-+        p[0] = 0;
-+        parentW.Length = (p-parent)*sizeof(WCHAR);
-+    }
++    if ((p = strrchrW(parent, '\\')) == NULL) return NULL;
++    p[0] = 0;
++    parentW.Length = (p-parent)*sizeof(WCHAR);
 +    memset(&pattr, 0x0, sizeof(pattr));
 +    pattr.Length = sizeof(pattr);
 +    pattr.Attributes = OBJ_CASE_INSENSITIVE;
@@ -155,7 +153,7 @@ index 1de2c61..8948bb7 100644
  /**************************************************************************
   *                 FILE_CreateFile                    (internal)
   * Open a file.
-@@ -161,10 +236,18 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT
+@@ -161,10 +234,18 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT
      {
          struct security_descriptor *sd;
          struct object_attributes objattr;

patches/06-winepulse/0001-winmm-Load-winealsa-if-winepulse-is-found.patch

@@ -1,6 +1,6 @@
-From 39ad530e3367082d908738de82cc786fea804308 Mon Sep 17 00:00:00 2001
+From 3822f907cd790b0405d2bad772a8240d559aa0aa Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
-Date: Fri, 22 Nov 2013 21:29:57 +0100
+Date: Sat, 4 Jan 2014 07:08:54 +0100
 Subject: [PATCH 08/42] winmm: Load winealsa if winepulse is found
 
 Fixes midi on winepulse
@@ -9,10 +9,10 @@ Fixes midi on winepulse
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c
-index f387323..3b1be27 100644
+index c3b3674..56cfe35 100644
 --- a/dlls/winmm/lolvldrv.c
 +++ b/dlls/winmm/lolvldrv.c
-@@ -543,7 +543,10 @@ static void MMDRV_Init(void)
+@@ -544,7 +544,10 @@ static void MMDRV_Init(void)
      drvA = HeapAlloc(GetProcessHeap(), 0, size);
      WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, drvA, size, NULL, NULL);
  
@@ -25,5 +25,5 @@ index f387323..3b1be27 100644
      HeapFree(GetProcessHeap(), 0, drvA);
      PropVariantClear(&pv);
 -- 
-1.8.4.4
+1.8.5.2
 

patches/06-winepulse/0002-winepulse-Add-initial-stub-for-pulseaudio-support.patch

@@ -1,6 +1,6 @@
-From a24bd3805faff36a0999f67ee0facda2989e189a Mon Sep 17 00:00:00 2001
+From ddd8b17270df0d8ba557d15e1c9425cab8c7fe12 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Fri, 22 Nov 2013 21:29:57 +0100
+Date: Sat, 4 Jan 2014 07:08:54 +0100
 Subject: [PATCH 09/42] winepulse: Add initial stub for pulseaudio support
 
 ---
@@ -10,28 +10,28 @@ added here.
  configure                             |  97 +++++++++++-
  configure.ac                          |  31 +++-
  dlls/mmdevapi/main.c                  |   2 +-
- dlls/winepulse.drv/Makefile.in        |   9 ++
+ dlls/winepulse.drv/Makefile.in        |   7 +
  dlls/winepulse.drv/mmdevdrv.c         | 290 ++++++++++++++++++++++++++++++++++
  dlls/winepulse.drv/winepulse.drv.spec |   5 +
- 6 files changed, 429 insertions(+), 5 deletions(-)
+ 6 files changed, 427 insertions(+), 5 deletions(-)
  create mode 100644 dlls/winepulse.drv/Makefile.in
  create mode 100644 dlls/winepulse.drv/mmdevdrv.c
  create mode 100644 dlls/winepulse.drv/winepulse.drv.spec
 
 diff --git a/configure b/configure
-index 17e8af6..7c5ed91 100755
+index b4dfb47..c8f9168 100755
 --- a/configure
 +++ b/configure
-@@ -658,6 +658,8 @@ OSS4INCL
- ALSALIBS
+@@ -653,6 +633,8 @@ OSS4_CFLAGS
+ ALSA_LIBS
  GSTREAMER_LIBS
  GSTREAMER_CFLAGS
 +PULSEINCL
 +PULSELIBS
- LIBGETTEXTPO
- ZLIB
+ GETTEXTPO_LIBS
+ Z_LIBS
  FREETYPE_LIBS
-@@ -835,6 +837,7 @@ with_osmesa
+@@ -830,6 +832,7 @@ with_osmesa
  with_oss
  with_png
  with_pthread
@@ -39,7 +39,7 @@ index 17e8af6..7c5ed91 100755
  with_sane
  with_tiff
  with_v4l
-@@ -2047,6 +2050,7 @@ Optional Packages:
+@@ -2044,6 +2047,7 @@ Optional Packages:
    --without-oss           do not use the OSS sound support
    --without-png           do not use PNG
    --without-pthread       do not use the pthread library
@@ -47,7 +47,7 @@ index 17e8af6..7c5ed91 100755
    --without-sane          do not use SANE (scanner support)
    --without-tiff          do not use TIFF
    --without-v4l           do not use v4l1 (v4l support)
-@@ -3282,6 +3286,12 @@ if test "${with_pthread+set}" = set; then :
+@@ -3281,6 +3285,12 @@ if test "${with_pthread+set}" = set; then :
  fi
  
  
@@ -60,7 +60,7 @@ index 17e8af6..7c5ed91 100755
  # Check whether --with-sane was given.
  if test "${with_sane+set}" = set; then :
    withval=$with_sane;
-@@ -11720,6 +11730,87 @@ esac
+@@ -12095,6 +12105,87 @@ esac
  fi
  fi
  
@@ -147,16 +147,16 @@ index 17e8af6..7c5ed91 100755
 +
  if test "x$with_gstreamer" != "xno"
  then
-     if test -n "$GSTREAMER_CFLAGS"; then :
-@@ -13057,12 +13148,13 @@ fi
+     if ${GSTREAMER_CFLAGS:+false} :; then :
+@@ -13394,12 +13473,13 @@ fi
  
- test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
- test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
+ test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
+ test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
 +test -n "$PULSELIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no}
  test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no}
  test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
  
--if test "x$ALSALIBS$COREAUDIO" = "x" -a \
+-if test "x$ALSA_LIBS$COREAUDIO_LIBS" = "x" -a \
 +if test "x$ALSALIBS$COREAUDIO$PULSELIBS" = "x" -a \
          "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \
 -        "x$with_alsa$with_coreaudio$with_oss" != xnonono
@@ -164,7 +164,7 @@ index 17e8af6..7c5ed91 100755
  then
      as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent."
  fi
-@@ -17268,6 +17360,7 @@ wine_fn_config_dll winemp3.acm enable_winemp3_acm
+@@ -17130,6 +17222,7 @@ wine_fn_config_dll winemp3.acm enable_winemp3_acm
  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
@@ -173,10 +173,10 @@ index 17e8af6..7c5ed91 100755
  wine_fn_config_dll winex11.drv enable_winex11_drv
  wine_fn_config_dll wing.dll16 enable_win16
 diff --git a/configure.ac b/configure.ac
-index 98a73f2..f5d0035 100644
+index 3c1101c..cf2cb7f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -68,6 +68,7 @@ AC_ARG_WITH(oss,       AS_HELP_STRING([--without-oss],[do not use the OSS sound
+@@ -70,6 +70,7 @@ AC_ARG_WITH(oss,       AS_HELP_STRING([--without-oss],[do not use the OSS sound
  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])
@@ -184,7 +184,7 @@ index 98a73f2..f5d0035 100644
  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)]))
-@@ -1542,6 +1543,30 @@ then
+@@ -1522,6 +1523,30 @@ then
            [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.])
  fi
  
@@ -215,16 +215,16 @@ index 98a73f2..f5d0035 100644
  dnl **** Check for gstreamer ****
  if test "x$with_gstreamer" != "xno"
  then
-@@ -1766,13 +1791,14 @@ fi
+@@ -1730,13 +1755,14 @@ fi
  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}
+ test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
+ test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
 +test -n "$PULSELIBS" || enable_winepulse_drv=${enable_winepulse_drv:-no}
  test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no}
  test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
  
  dnl **** Check for any sound system ****
--if test "x$ALSALIBS$COREAUDIO" = "x" -a \
+-if test "x$ALSA_LIBS$COREAUDIO_LIBS" = "x" -a \
 +if test "x$ALSALIBS$COREAUDIO$PULSELIBS" = "x" -a \
          "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \
 -        "x$with_alsa$with_coreaudio$with_oss" != xnonono
@@ -232,7 +232,7 @@ index 98a73f2..f5d0035 100644
  then
      WINE_WARNING([No sound system was found. Windows applications will be silent.])
  fi
-@@ -3260,6 +3286,7 @@ WINE_CONFIG_DLL(winemp3.acm)
+@@ -3184,6 +3210,7 @@ WINE_CONFIG_DLL(winemp3.acm)
  WINE_CONFIG_DLL(wineoss.drv)
  WINE_CONFIG_DLL(wineps.drv,,[clean,po])
  WINE_CONFIG_DLL(wineps16.drv16,enable_win16)
@@ -255,19 +255,17 @@ index 447813f..b9ae99e 100644
      DriverFuncs driver;
 diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
 new file mode 100644
-index 0000000..0f595f1
+index 0000000..ae66542
 --- /dev/null
 +++ b/dlls/winepulse.drv/Makefile.in
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,7 @@
 +MODULE    = winepulse.drv
 +IMPORTS   = dxguid uuid winmm user32 advapi32 ole32
-+EXTRALIBS = @PULSELIBS@ @LIBPTHREAD@
++EXTRALIBS = @PULSELIBS@ @PTHREAD_LIBS@
 +EXTRAINCL = @PULSEINCL@
 +
 +C_SRCS = \
 +	mmdevdrv.c
-+
-+@MAKE_DLL_RULES@
 diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
 new file mode 100644
 index 0000000..d187bdc
@@ -576,5 +574,5 @@ index 0000000..a089166
 +@ stdcall -private GetAudioEndpoint(ptr ptr long ptr) AUDDRV_GetAudioEndpoint
 +@ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager
 -- 
-1.8.4.4
+1.8.5.2
 

patches/06-winepulse/0003-winepulse-Add-format-and-period-probing.patch

@@ -1,6 +1,6 @@
-From 8dd6c030b4487907c24b6b98cc0b88c7bb15e953 Mon Sep 17 00:00:00 2001
+From 04a80af2cccad7e15b49dd1dd6c04fe2e00da2e9 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Fri, 22 Nov 2013 21:29:57 +0100
+Date: Sat, 4 Jan 2014 07:08:54 +0100
 Subject: [PATCH 10/42] winepulse: Add format and period probing
 
 ---
@@ -168,5 +168,5 @@ index d187bdc..40db26d 100644
          UINT *num, UINT *def_index)
  {
 -- 
-1.8.4.4
+1.8.5.2
 

patches/06-winepulse/0004-winepulse-Add-audioclient.patch

@@ -1,6 +1,6 @@
-From e3638b92aba104a74831090f0acf7779dcf055dd Mon Sep 17 00:00:00 2001
+From faac72c2c84e0a156e3c7def10b945b4a45f01f6 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Fri, 22 Nov 2013 21:29:57 +0100
+Date: Sat, 4 Jan 2014 07:08:54 +0100
 Subject: [PATCH 11/42] winepulse: Add audioclient
 
 ---
@@ -1094,5 +1094,5 @@ index 40db26d..37d85ff 100644
          IAudioSessionManager2 **out)
  {
 -- 
-1.8.4.4
+1.8.5.2
 

patches/06-winepulse/0005-winepulse-Add-IAudioRenderClient-and-IAudioCaptureCl.patch

@@ -1,6 +1,6 @@
-From 24e5a426ff9493945ff2c834375a57f688f0356b Mon Sep 17 00:00:00 2001
+From d8b1b43529fa98eb0a04d1616f1b98d264d2018b Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Fri, 22 Nov 2013 21:29:57 +0100
+Date: Sat, 4 Jan 2014 07:08:54 +0100
 Subject: [PATCH 12/42] winepulse: Add IAudioRenderClient and
  IAudioCaptureClient
 
@@ -348,5 +348,5 @@ index 37d85ff..01cfd25 100644
          IAudioSessionManager2 **out)
  {
 -- 
-1.8.4.4
+1.8.5.2
 

patches/06-winepulse/0006-winepulse-Add-IAudioClock-and-IAudioClock2.patch

@@ -1,6 +1,6 @@
-From fa8bdbe20707458b7b43f9afc2d93adaadc833be Mon Sep 17 00:00:00 2001
+From 96b254276b471a85c6705b0043894bed308118f1 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Fri, 22 Nov 2013 21:29:57 +0100
+Date: Sat, 4 Jan 2014 07:08:54 +0100
 Subject: [PATCH 13/42] winepulse: Add IAudioClock and IAudioClock2
 
 ---
@@ -205,5 +205,5 @@ index 01cfd25..3ed2288 100644
          IAudioSessionManager2 **out)
  {
 -- 
-1.8.4.4
+1.8.5.2
 

patches/06-winepulse/0007-winepulse-Add-audiostreamvolume.patch

@@ -1,6 +1,6 @@
-From 3b427a167037eec4e3f6b0be941c11795235c635 Mon Sep 17 00:00:00 2001
+From d67a96e9b1cc13a5fa98bfb0f1a9a0b638d7f117 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Fri, 22 Nov 2013 21:29:57 +0100
+Date: Sat, 4 Jan 2014 07:08:54 +0100
 Subject: [PATCH 14/42] winepulse: Add audiostreamvolume
 
 ---
@@ -281,5 +281,5 @@ index 3ed2288..b7414c2 100644
          IAudioSessionManager2 **out)
  {
 -- 
-1.8.4.4
+1.8.5.2
 

patches/06-winepulse/0008-winepulse-Add-session-support.patch

@@ -1,6 +1,6 @@
-From a75af9bfd896d14d0271aa9f67714e966c02211e Mon Sep 17 00:00:00 2001
+From 6adc30134f5b3223b038041752e4a7020342c9d9 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Fri, 22 Nov 2013 21:29:57 +0100
+Date: Sat, 4 Jan 2014 07:08:54 +0100
 Subject: [PATCH 15/42] winepulse: Add session support
 
 ---
@@ -932,5 +932,5 @@ index b7414c2..64ee62e 100644
 +    return S_OK;
  }
 -- 
-1.8.4.4
+1.8.5.2
 

patches/06-winepulse/0009-fix-fdels-trailing-whitespaces.patch

@@ -1,6 +1,6 @@
-From 832d14f35d779db701a00fc839750d40d92092b2 Mon Sep 17 00:00:00 2001
+From 743d1d5364e1e62c8a1c05a1a7eed1baed18febf Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Fri, 22 Nov 2013 21:29:57 +0100
+Date: Sat, 4 Jan 2014 07:08:54 +0100
 Subject: [PATCH 16/42] fix fdels trailing whitespaces
 
 Happy? :P
@@ -31,5 +31,5 @@ index 64ee62e..5a71a3d 100644
      if (*pos < This->clock_lastpos)
          *pos = This->clock_lastpos;
 -- 
-1.8.4.4
+1.8.5.2
 

patches/06-winepulse/0010-winepulse-v12.patch

@@ -1,6 +1,6 @@
-From 34f9b00bfe94027b2e6763dfb9a66ddf13df2eff Mon Sep 17 00:00:00 2001
+From 61642a5c08f38b32d2eef819b82f6adc24466932 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Fri, 22 Nov 2013 21:29:58 +0100
+Date: Sat, 4 Jan 2014 07:08:54 +0100
 Subject: [PATCH 17/42] winepulse v12
 
 Changes since v11:
@@ -44,5 +44,5 @@ index 5a71a3d..960af3c 100644
              copy = rem;
              if (copy > src_len)
 -- 
-1.8.4.4
+1.8.5.2
 

patches/06-winepulse/0011-winepulse-v15-Add-support-for-missing-formats-and-si.patch

@@ -1,6 +1,6 @@
-From b60b5c38e4f55e60e951fb50a0905b76aa0dc815 Mon Sep 17 00:00:00 2001
+From 1966576a4b5cdc7b6003cb93cb0953670aaa9235 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Fri, 22 Nov 2013 21:29:58 +0100
+Date: Sat, 4 Jan 2014 07:08:54 +0100
 Subject: [PATCH 18/42] winepulse v15: Add support for missing formats, and
  silence an error for missing format tags
 
@@ -37,5 +37,5 @@ index 960af3c..f52f119 100644
      This->ss.channels = This->map.channels;
      if (!pa_channel_map_valid(&This->map) || This->ss.format == PA_SAMPLE_INVALID) {
 -- 
-1.8.4.4
+1.8.5.2
 

patches/06-winepulse/0012-winepulse-v16-Add-official-warning-wine-doesn-t-want.patch

@@ -1,6 +1,6 @@
-From 95ae131b414df0b866fb1cf42e384c0e69af79de Mon Sep 17 00:00:00 2001
+From 3edd1b44eec39916de3284b02d62e121b5d86d23 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Fri, 22 Nov 2013 21:29:58 +0100
+Date: Sat, 4 Jan 2014 07:08:54 +0100
 Subject: [PATCH 19/42] winepulse v16: Add official warning wine doesn't want
  to support winepulse
 
@@ -75,5 +75,5 @@ index f52f119..76a2e0e 100644
          return E_UNEXPECTED;
  
 -- 
-1.8.4.4
+1.8.5.2
 

patches/06-winepulse/0013-winepulse-v17-Fix-winmm-tests.patch

@@ -1,6 +1,6 @@
-From b5111c70a07ffd6ce97f4300686556d7bc1bccd3 Mon Sep 17 00:00:00 2001
+From 3749b1e2e55d2bebc795420b81209a992602cf2d Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-Date: Fri, 22 Nov 2013 21:29:58 +0100
+Date: Sat, 4 Jan 2014 07:08:54 +0100
 Subject: [PATCH 20/42] winepulse v17: Fix winmm tests
 
 Handle dwChannelMask = SPEAKER_ALL better so WAVE_FORMAT_EXTENSIBLE tests pass too
@@ -121,5 +121,5 @@ index 76a2e0e..6e75674 100644
      if (hr == S_OK || !out) {
          CoTaskMemFree(closest);
 -- 
-1.8.4.4
+1.8.5.2
 

patches/06-winepulse/0014-winepulse-v18-Latency-and-compilation-improvements.patch

@@ -1,6 +1,6 @@
-From c87397b563c9eb30a1a2f347b7690a9d76c14fbb Mon Sep 17 00:00:00 2001
+From c70efb35703e991685bf33b2e3faba3a1365a58f Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
-Date: Fri, 22 Nov 2013 21:29:58 +0100
+Date: Sat, 4 Jan 2014 07:08:54 +0100
 Subject: [PATCH 21/42] winepulse v18: Latency and compilation improvements
 
 Changes since v17:
@@ -203,5 +203,5 @@ index 6e75674..8e76826 100644
      /* Make time never go backwards */
      if (*pos < This->clock_lastpos)
 -- 
-1.8.4.4
+1.8.5.2