From 0691f0d97c4331957f80e81f72e6413c5f3b5043 Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <andreas.bierfert@lowlatency.de>
Date: Wed, 29 Sep 2010 21:18:27 +0200
Subject: [PATCH] winepulse upgrade to 0.39

---
 ...c.patch => winepulse-0.39-configure.ac.patch | 17 ++++++++---------
 winepulse-0.38.patch => winepulse-0.39.patch    | 10 +++-------
 2 files changed, 11 insertions(+), 16 deletions(-)
 rename winepulse-0.38-configure.ac.patch => winepulse-0.39-configure.ac.patch (85%)
 rename winepulse-0.38.patch => winepulse-0.39.patch (99%)

diff --git a/winepulse-0.38-configure.ac.patch b/winepulse-0.39-configure.ac.patch
similarity index 85%
rename from winepulse-0.38-configure.ac.patch
rename to winepulse-0.39-configure.ac.patch
index d44a4e6..5055b6d 100644
--- a/winepulse-0.38-configure.ac.patch
+++ b/winepulse-0.39-configure.ac.patch
@@ -1,8 +1,8 @@
 diff --git a/configure.ac b/configure.ac
-index 61f376e..6fe1261 100644
+index 341ba181..998e063 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -76,6 +76,7 @@ AC_ARG_WITH(png,       AS_HELP_STRING([--without-png],[do not use PNG]),
+@@ -78,6 +78,7 @@ AC_ARG_WITH(png,       AS_HELP_STRING([--without-png],[do not use PNG]),
              [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi])
  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])
@@ -10,39 +10,38 @@ index 61f376e..6fe1261 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]),
              [if test "x$withval" = "xno"; then ac_cv_header_tiffio_h=no; fi])
-@@ -1386,6 +1387,31 @@ then
+@@ -1402,6 +1403,30 @@ then
      CFLAGS="$save_CFLAGS"
  fi
  
 +dnl **** Check for PulseAudio ****
 +AC_SUBST(PULSELIBS,"")
-+AC_SUBST(PULSECFLAGS,"")
++AC_SUBST(PULSEINCL,"")
 +if test "x$with_pulse" != "xno";
 +then
 +    ac_save_CPPFLAGS="$CPPFLAGS"
 +    if test "$PKG_CONFIG" != "false";
 +    then
 +        ac_pulse_libs="`$PKG_CONFIG --libs libpulse 2>/dev/null`"
-+        ac_pulse_cflags="`$PKG_CONFIG --cflags libpulse 2>/dev/null`"
++        ac_pulse_cflags="`$PKG_CONFIG --cflags-only-I libpulse 2>/dev/null`"
 +
 +        CPPFLAGS="$CPPFLAGS $ac_pulse_cflags"
 +        AC_CHECK_HEADERS(pulse/pulseaudio.h,
 +            [AC_CHECK_LIB(pulse, pa_stream_is_corked,
 +                [AC_DEFINE(HAVE_PULSEAUDIO, 1, [Define if you have pulseaudio])
 +                 PULSELIBS="$ac_pulse_libs"
-+                 PULSECFLAGS="$ac_pulse_cflags"],,$ac_pulse_libs)
++                 PULSEINCL="$ac_pulse_cflags"],,$ac_pulse_libs)
 +        ])
 +    fi
 +    CPPFLAGS="$ac_save_CPPFLAGS"
 +fi
 +WINE_WARNING_WITH(pulse, [test "$ac_cv_lib_pulse_pa_stream_is_corked" != "yes"],
 +        [libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.])
-+
 +
  dnl **** Check for ALSA 1.x ****
  AC_SUBST(ALSALIBS,"")
  if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
-@@ -1553,7 +1579,7 @@ dnl **** Check for libodbc ****
+@@ -1580,7 +1605,7 @@ dnl **** Check for libodbc ****
  WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])
  
  dnl **** Check for any sound system ****
@@ -51,7 +50,7 @@ index 61f376e..6fe1261 100644
          "$ac_cv_header_sys_soundcard_h" != "yes" -a \
          "$ac_cv_header_machine_soundcard_h" != "yes" -a \
          "$ac_cv_header_soundcard_h" != "yes" -a \
-@@ -2648,6 +2674,7 @@ WINE_CONFIG_DLL(winenas.drv)
+@@ -2724,6 +2749,7 @@ WINE_CONFIG_DLL(winenas.drv)
  WINE_CONFIG_DLL(wineoss.drv)
  WINE_CONFIG_DLL(wineps.drv)
  WINE_CONFIG_DLL(wineps16.drv16,enable_win16)
diff --git a/winepulse-0.38.patch b/winepulse-0.39.patch
similarity index 99%
rename from winepulse-0.38.patch
rename to winepulse-0.39.patch
index 6c4c271..9a4b773 100644
--- a/winepulse-0.38.patch
+++ b/winepulse-0.39.patch
@@ -1,17 +1,13 @@
 diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
 new file mode 100644
-index 0000000..ed48381
+index 0000000..a6fdbf8
 --- /dev/null
 +++ b/dlls/winepulse.drv/Makefile.in
-@@ -0,0 +1,14 @@
-+TOPSRCDIR = @top_srcdir@
-+TOPOBJDIR = ../..
-+SRCDIR    = @srcdir@
-+VPATH     = @srcdir@
+@@ -0,0 +1,10 @@
 +MODULE    = winepulse.drv
 +IMPORTS   = winmm user32 kernel32
 +EXTRALIBS = @PULSELIBS@
-+EXTRACFLAGS = @PULSEINCL@
++EXTRAINCL = @PULSEINCL@
 +
 +C_SRCS = waveout.c \
 +         wavein.c \