diff --git a/debian/changelog b/debian/changelog index 000e3b10..e5342241 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,7 @@ +wine-compholio (1.7.12-1) unstable; urgency=low + * Fixed PulseAudio driver configure file for upstream Wine 1.7.12. + -- Erich E. Hoover Fri, 07 Feb 2014 16:50:05 -0700 + wine-compholio (1.7.12) unstable; urgency=low * Added new patches to support GetVolumePathName. -- Erich E. Hoover Fri, 07 Feb 2014 14:57:33 -0700 diff --git a/patches/06-winepulse/0002-winepulse-Add-initial-stub-for-pulseaudio-support.patch b/patches/06-winepulse/0002-winepulse-Add-initial-stub-for-pulseaudio-support.patch index 210af8b1..96c733a3 100644 --- a/patches/06-winepulse/0002-winepulse-Add-initial-stub-for-pulseaudio-support.patch +++ b/patches/06-winepulse/0002-winepulse-Add-initial-stub-for-pulseaudio-support.patch @@ -22,14 +22,14 @@ diff --git a/configure b/configure index b4dfb47..c8f9168 100755 --- a/configure +++ b/configure -@@ -653,6 +653,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 @@ -830,6 +832,7 @@ with_osmesa with_oss @@ -148,15 +148,15 @@ index b4dfb47..c8f9168 100755 if test "x$with_gstreamer" != "xno" then if test -n "$GSTREAMER_CFLAGS"; then : -@@ -13432,12 +13523,13 @@ fi +@@ -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 @@ -215,16 +215,16 @@ index 3c1101c..cf2cb7f 100644 dnl **** Check for gstreamer **** if test "x$with_gstreamer" != "xno" then -@@ -1746,13 +1771,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