- version upgrade

.cvsignore

@@ -1 +1 @@
-wine-0.9.53-fe.tar.bz2
+wine-0.9.54-fe.tar.bz2

README-FEDORA-PULSEAUDIO

@@ -1,10 +1,38 @@
 Wine and Pulseaudio Support
 ---------------------------
+Currently wine does not have native support for pulseaudio. However different
+ways exist to make wine sound work alongside pulseaudio. Different sound
+outputs can be selected via `winecfg` or in the registry of wine.
 
-Currently wine does not have native support for pulseaudio. As a workaround to
-make wine work alongside pulseaudio select OSS sound output in winecfg. Wine
-then calls padsp as a wrapper if alsa-plugin-pulseaudio and pulseaudio-utils is
-installed. 
+
+ALSA
+----
+To achieve sound output via the wine alsa driver you need to add
+a pulseaudio alsa device to the alsa configuration and activate it in wine. See
+http://www.pulseaudio.org/wiki/PerfectSetup#ALSAApplications on how to do this.
+
+
+Esound
+------
+If the pulseaudio-esound-compat package is installed selecting the EsounD driver
+in wine should enable sound via pulseaudio.
+
+OSS
+---
+To use the oss driver of wine copy the following script to ~/bin/wine and make
+sure that ~/bin is in your path with a higher priority then /usr/bin. The script
+will call the pulseaudio dsp wrapper padsp.
+
+#!/bin/sh
+if [ -x /usr/lib*/alsa-lib/libasound_module_pcm_pulse.so ] && [ -x "/usr/bin/padsp" ] ; then
+    echo "Running padsp as pulseaudio wrapper for wine"
+    exec padsp -n Wine -- /usr/bin/wine "$@"
+else
+    exec /usr/bin/wine "$@"
+fi
+
+For more information on a good pulseaudio setup see:
+http://www.pulseaudio.org/wiki/PerfectSetup
 
 If you think you have found a bug related to this take a look at the bug
 reporting procedure at http://fedoraproject.org/wiki/AndreasBierfert/Wine.

sources

@@ -1 +1 @@
-afead7bf1c9b4ae2758e03f82e0d6e88  wine-0.9.53-fe.tar.bz2
+a2677aa04cc7e9a27e8de533b8166627  wine-0.9.54-fe.tar.bz2

wine.spec

@@ -1,6 +1,6 @@
 Name:		wine
-Version:	0.9.53
-Release:	2%{?dist}
+Version:	0.9.54
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -43,8 +43,7 @@ Source300:      wine-mime-msi.desktop
 Source400:      wineshelllink-fedora
 Patch400:       wine-wineshelllink.patch
 
-# fix for pulseaudio playback (#344281)
-Source401:      wine-pulseaudio.sh
+# explain how to use wine with pulseaudio
 Source402:      README-FEDORA-PULSEAUDIO
 
 
@@ -309,9 +308,7 @@ install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 install -p -m755 %{SOURCE400} $RPM_BUILD_ROOT%{_bindir}/wineshelllink-fedora
 
 
-# pulseaudio workaround (#344281)
-mv $RPM_BUILD_ROOT%{_bindir}/{wine,wine_bin}
-install -pm755 %{SOURCE401} $RPM_BUILD_ROOT%{_bindir}/wine
+# deploy pulseaudio readme
 cp %{SOURCE402} .
 
 %clean
@@ -372,7 +369,6 @@ update-desktop-database &>/dev/null || :
 %{_bindir}/regedit
 %{_bindir}/regsvr32
 %{_bindir}/wine
-%{_bindir}/wine_bin
 %{_bindir}/wineboot
 %{_bindir}/winebrowser
 %{_bindir}/wineconsole
@@ -457,6 +453,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/d3d10.dll.so
 %{_libdir}/wine/d3dim.dll.so
 %{_libdir}/wine/d3drm.dll.so
+%{_libdir}/wine/d3dx9_36.dll.so
 %{_libdir}/wine/d3dxof.dll.so
 %{_libdir}/wine/dbghelp.dll.so
 %{_libdir}/wine/dciman32.dll.so
@@ -552,6 +549,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/msnet32.dll.so
 %{_libdir}/wine/msrle32.dll.so
 %{_libdir}/wine/msvcirt.dll.so
+%{_libdir}/wine/msvcr71.dll.so
 %{_libdir}/wine/msvcrt.dll.so
 %{_libdir}/wine/msvcrt20.dll.so
 %{_libdir}/wine/msvcrt40.dll.so
@@ -589,6 +587,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/pdh.dll.so
 %{_libdir}/wine/powrprof.dll.so
 %{_libdir}/wine/printui.dll.so
+%{_libdir}/wine/propsys.dll.so
 %{_libdir}/wine/psapi.dll.so
 %{_libdir}/wine/pstorec.dll.so
 %{_libdir}/wine/qcap.dll.so
@@ -670,6 +669,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/winnls32.dll.so
 %{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
+%{_libdir}/wine/wmi.dll.so
 %{_libdir}/wine/spoolss.dll.so
 %{_libdir}/wine/winscard.dll.so
 %{_libdir}/wine/wintab.dll16
@@ -788,6 +788,12 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/*.def
 
 %changelog
+* Fri Jan 25 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.9.54-1
+- version upgrade
+- remove default pulseaudio workaround (#429420,#428745)
+- improve pulseaudio readme
+
 * Sun Jan 13 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.9.53-2
 - add some missing BR