From b9af738cc87e9e738084e2848df92abff594a578 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Jan 25 2008 18:00:12 +0000 Subject: - version upgrade --- diff --git a/.cvsignore b/.cvsignore index 0234268..7dc8e35 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wine-0.9.53-fe.tar.bz2 +wine-0.9.54-fe.tar.bz2 diff --git a/README-FEDORA-PULSEAUDIO b/README-FEDORA-PULSEAUDIO new file mode 100644 index 0000000..764a1e5 --- /dev/null +++ b/README-FEDORA-PULSEAUDIO @@ -0,0 +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. + + +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. diff --git a/sources b/sources index f55872a..9347104 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -afead7bf1c9b4ae2758e03f82e0d6e88 wine-0.9.53-fe.tar.bz2 +a2677aa04cc7e9a27e8de533b8166627 wine-0.9.54-fe.tar.bz2 diff --git a/wine.spec b/wine.spec index ee7206d..3104693 100644 --- a/wine.spec +++ b/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,6 +43,9 @@ Source300: wine-mime-msi.desktop Source400: wineshelllink-fedora Patch400: wine-wineshelllink.patch +# explain how to use wine with pulseaudio +Source402: README-FEDORA-PULSEAUDIO + Patch0: wine-prefixfonts.patch Patch1: wine-rpath.patch @@ -305,6 +308,9 @@ install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ install -p -m755 %{SOURCE400} $RPM_BUILD_ROOT%{_bindir}/wineshelllink-fedora +# deploy pulseaudio readme +cp %{SOURCE402} . + %clean rm -rf %{buildroot} @@ -357,6 +363,8 @@ update-desktop-database &>/dev/null || : %doc AUTHORS README-Fedora README VERSION # do not include huge changelogs .OLD .ALPHA (#204302) %doc documentation/README.* +# pulseaudio workaround documentation +%doc README-FEDORA-PULSEAUDIO %{_bindir}/msiexec %{_bindir}/regedit %{_bindir}/regsvr32 @@ -445,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 @@ -540,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 @@ -577,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 @@ -658,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 @@ -776,6 +788,12 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/*.def %changelog +* Fri Jan 25 2008 Andreas Bierfert +- 0.9.54-1 +- version upgrade +- remove default pulseaudio workaround (#429420,#428745) +- improve pulseaudio readme + * Sun Jan 13 2008 Andreas Bierfert - 0.9.53-2 - add some missing BR @@ -794,10 +812,12 @@ update-desktop-database &>/dev/null || : * Fri Dec 28 2007 Andreas Bierfert - 0.9.51-3 +- add -n Wine to pulseaudio workaround - try to fix menu bug #393641 * Fri Dec 28 2007 Andreas Bierfert - 0.9.51-2 +- add fix for #344281 pulseaudio workaround - fix #253474: wine-jack should require jack-audio-connection-kit * Sun Dec 16 2007 Andreas Bierfert