rpms
/
wine
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- version upgrade

Browse Source 
- update winepulse patches
f38
Andreas Bierfert 16 years ago
parent d1b5d9aa54
commit 8ec558f7d4
12 changed files with 3818 additions and 2495 deletions
Show Stats Download Patch File Download Diff File

2
.cvsignore
Unescape View File

@ -1 +1 @@
wine-1.1.14-fe.tar.bz2
wine-1.1.15-fe.tar.bz2

27
README-FEDORA-PULSEAUDIO
Unescape View File

@ -1,10 +1,29 @@
Wine and Pulseaudio Support
---------------------------
Currently wine does not have native support for pulseaudio. However, some
patches exist to make wine use a native pulseaudio backend
(see http://bugs.winehq.org/show_bug.cgi?id=10495). These have been included
into the fedora wine package. If you have problems please do _not_ report them
to the wine project.
patches exist to make wine use a native pulseaudio backend (see [1])
These have been included into the fedora wine package. If you have problems
please do _not_ report them to the wine project.
Here are some useful configuration options taken from [1]:
HKCU\Software\Wine\Drivers:Audio
A string which contains a comma seperated list of audio backends for wine to
try, in order of preference. For example “pulse,alsa,esd”. Settable through
winecfg.
HKCU\Software\Wine\Pulse Driver:MonitorDevices
A string which contains Y or N. If Y, sink monitors will show up as input
devices. If N, only capture sources will be show up as input devices.
Default is Y.
HKCU\Software\Wine\DirectSound:HardwareAcceleration
A string. Also settable in winecfg. When set to “Emulation” WaveOut will be
used for directsound, which is more likely to work, but will have more latency.
When set to “Full” the directsound driver is tried for directsound support,
resulting in less latency, but possibley failure or bad sound.
[1] - http://art.ified.ca/?page_id=40
Other ways to get wine working with pulseaudio are described below:

289
adding-pulseaudio-to-winecfg.patch
Unescape View File

@ -0,0 +1,289 @@
diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc
index 8861657..cf91012 100644
--- a/programs/winecfg/Bg.rc
+++ b/programs/winecfg/Bg.rc
@@ -274,6 +274,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
+ IDS_DRIVER_PULSE "PulseAudio Driver"
IDS_DRIVER_ALSA "ALSA Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc
index 07f035f..8897237 100644
--- a/programs/winecfg/Cs.rc
+++ b/programs/winecfg/Cs.rc
@@ -273,6 +273,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standardní"
IDS_ACCEL_BASIC "Základní"
IDS_ACCEL_EMULATION "Emulace"
+ IDS_DRIVER_PULSE "Ovladaè PulseAudio"
IDS_DRIVER_ALSA "Ovladaè ALSA"
IDS_DRIVER_ESOUND "Ovladaè EsounD"
IDS_DRIVER_OSS "Ovladaè OSS"
diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc
index 1d655ad..a1c9653 100644
--- a/programs/winecfg/Da.rc
+++ b/programs/winecfg/Da.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Grundlæggende"
IDS_ACCEL_EMULATION "Emuléring"
+ IDS_DRIVER_PULSE "PulseAudio-driver"
IDS_DRIVER_ALSA "ALSA-driver"
IDS_DRIVER_ESOUND "EsounD-driver"
IDS_DRIVER_OSS "OSS-driver"
diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc
index 9ed3d63..614247b 100644
--- a/programs/winecfg/De.rc
+++ b/programs/winecfg/De.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Einfach"
IDS_ACCEL_EMULATION "Emulation"
+ IDS_DRIVER_PULSE "PulseAudio-Treiber"
IDS_DRIVER_ALSA "ALSA-Treiber"
IDS_DRIVER_ESOUND "EsounD-Treiber"
IDS_DRIVER_OSS "OSS-Treiber"
diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc
index 5743ba3..b165a81 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -270,6 +270,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
+ IDS_DRIVER_PULSE "PulseAudio Driver"
IDS_DRIVER_ALSA "ALSA Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index 440ea71..dd1b764 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Estándar"
IDS_ACCEL_BASIC "Básica"
IDS_ACCEL_EMULATION "Emulación"
+ IDS_DRIVER_PULSE "Manejador PulseAudio"
IDS_DRIVER_ALSA "Manejador ALSA"
IDS_DRIVER_ESOUND "Manejador EsounD"
IDS_DRIVER_OSS "Manejador OSS"
diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc
index 1d761f8..e1b1583 100644
--- a/programs/winecfg/Fi.rc
+++ b/programs/winecfg/Fi.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
+ IDS_DRIVER_PULSE "PulseAudio Driver"
IDS_DRIVER_ALSA "ALSA Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc
index 818c50f..97a1f44 100644
--- a/programs/winecfg/Fr.rc
+++ b/programs/winecfg/Fr.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Basique"
IDS_ACCEL_EMULATION "Émulation"
+ IDS_DRIVER_PULSE "Pilote PulseAudio"
IDS_DRIVER_ALSA "Pilote ALSA"
IDS_DRIVER_ESOUND "Pilote EsounD"
IDS_DRIVER_OSS "Pilote OSS"
diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc
index 5afbf91..4131f5f 100644
--- a/programs/winecfg/Hu.rc
+++ b/programs/winecfg/Hu.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
+ IDS_DRIVER_PULSE "PulseAudio Driver"
IDS_DRIVER_ALSA "ALSA Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc
index 8eaa603..543ed2c 100644
--- a/programs/winecfg/Ja.rc
+++ b/programs/winecfg/Ja.rc
@@ -273,6 +273,7 @@ BEGIN
IDS_ACCEL_STANDARD "標準"
IDS_ACCEL_BASIC "基本"
IDS_ACCEL_EMULATION "エミュレーション"
+ IDS_DRIVER_PULSE "PulseAudio Driver"
IDS_DRIVER_ALSA "ALSA Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc
index ca94b5b..a79cc03 100644
--- a/programs/winecfg/Ko.rc
+++ b/programs/winecfg/Ko.rc
@@ -272,6 +272,7 @@ BEGIN
IDS_ACCEL_STANDARD "Ç¥ÁØ"
IDS_ACCEL_BASIC "񃧯"
IDS_ACCEL_EMULATION "¾Ö¹Ä·¹À̼Ç"
+ IDS_DRIVER_PULSE "PulseAudio µå¶óÀ̹ö"
IDS_DRIVER_ALSA "ALSA µå¶óÀ̹ö"
IDS_DRIVER_ESOUND "EsounD µå¶óÀ̹ö"
IDS_DRIVER_OSS "OSS µå¶óÀ̹ö"
diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc
index fb91290..b23e919 100644
--- a/programs/winecfg/Nl.rc
+++ b/programs/winecfg/Nl.rc
@@ -270,6 +270,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standaard"
IDS_ACCEL_BASIC "Eenvoudig"
IDS_ACCEL_EMULATION "Emulatie"
+ IDS_DRIVER_PULSE "PulseAudio Stuurprogramma"
IDS_DRIVER_ALSA "ALSA Stuurprogramma"
IDS_DRIVER_ESOUND "EsounD Stuurprogramma"
IDS_DRIVER_OSS "OSS Stuurprogramma"
diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc
index aaa64c3..9dd3572 100644
--- a/programs/winecfg/No.rc
+++ b/programs/winecfg/No.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Grunnleggende"
IDS_ACCEL_EMULATION "Emulering"
+ IDS_DRIVER_PULSE "PulseAudio-driver"
IDS_DRIVER_ALSA "ALSA-driver"
IDS_DRIVER_ESOUND "EsounD-driver"
IDS_DRIVER_OSS "OSS-driver"
diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc
index c426443..e3bf093 100644
--- a/programs/winecfg/Pl.rc
+++ b/programs/winecfg/Pl.rc
@@ -271,6 +271,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standardowe"
IDS_ACCEL_BASIC "Podstawowe"
IDS_ACCEL_EMULATION "Emulacja"
+ IDS_DRIVER_PULSE "Sterownik PulseAudio"
IDS_DRIVER_ALSA "Sterownik ALSA"
IDS_DRIVER_ESOUND "Sterownik EsounD"
IDS_DRIVER_OSS "Sterownik OSS"
diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc
index 830cabf..0ed1dbd 100644
--- a/programs/winecfg/Pt.rc
+++ b/programs/winecfg/Pt.rc
@@ -465,6 +465,7 @@ BEGIN
IDS_ACCEL_STANDARD "Padrão"
IDS_ACCEL_BASIC "Básico"
IDS_ACCEL_EMULATION "Emulação"
+ IDS_DRIVER_PULSE "Controlador PulseAudio"
IDS_DRIVER_ALSA "Controlador ALSA"
IDS_DRIVER_ESOUND "Controlador EsounD"
IDS_DRIVER_OSS "Controlador OSS"
diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc
index a4b0cad..c065d36 100644
--- a/programs/winecfg/Ro.rc
+++ b/programs/winecfg/Ro.rc
@@ -270,6 +270,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "De basă"
IDS_ACCEL_EMULATION "Emulare"
+ IDS_DRIVER_PULSE "Driver PulseAudio"
IDS_DRIVER_ALSA "Driver ALSA"
IDS_DRIVER_ESOUND "Driver Esound"
IDS_DRIVER_OSS "Driver OSS"
diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc
index 782e1fd..f516399 100644
--- a/programs/winecfg/Ru.rc
+++ b/programs/winecfg/Ru.rc
@@ -272,6 +272,7 @@ BEGIN
IDS_ACCEL_STANDARD "Ñòàíäàðòíîå"
IDS_ACCEL_BASIC "Ìèíèìàëüíîå"
IDS_ACCEL_EMULATION "Ýìóëÿöèÿ"
+ IDS_DRIVER_PULSE "PulseAudio äðàéâåð"
IDS_DRIVER_ALSA "ALSA äðàéâåð"
IDS_DRIVER_ESOUND "EsounD äðàéâåð"
IDS_DRIVER_OSS "OSS äðàéâåð"
diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc
index 0bd04ef..c8bd35e 100644
--- a/programs/winecfg/Si.rc
+++ b/programs/winecfg/Si.rc
@@ -270,6 +270,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standardno"
IDS_ACCEL_BASIC "Osnovno"
IDS_ACCEL_EMULATION "Emulacija"
+ IDS_DRIVER_PULSE "PulseAudio gonilnik"
IDS_DRIVER_ALSA "ALSA gonilnik"
IDS_DRIVER_ESOUND "EsounD gonilnik"
IDS_DRIVER_OSS "OSS gonilnik"
diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc
index 49bb236..7efe2c0 100644
--- a/programs/winecfg/Sv.rc
+++ b/programs/winecfg/Sv.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Grundläggande"
IDS_ACCEL_EMULATION "Emulering"
+ IDS_DRIVER_PULSE "PulseAudio-drivrutin"
IDS_DRIVER_ALSA "ALSA-drivrutin"
IDS_DRIVER_ESOUND "EsounD-drivrutin"
IDS_DRIVER_OSS "OSS-drivrutin"
diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc
index 4157f86..1be23c5 100644
--- a/programs/winecfg/Tr.rc
+++ b/programs/winecfg/Tr.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standart"
IDS_ACCEL_BASIC "Temel"
IDS_ACCEL_EMULATION "Taklit"
+ IDS_DRIVER_PULSE "PulseAudio Sürücüsü"
IDS_DRIVER_ALSA "ALSA Sürücüsü"
IDS_DRIVER_ESOUND "EsounD Sürücüsü"
IDS_DRIVER_OSS "OSS Sürücüsü"
diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc
index 4c18e99..029a26d 100644
--- a/programs/winecfg/Zh.rc
+++ b/programs/winecfg/Zh.rc
@@ -271,6 +271,7 @@ BEGIN
IDS_ACCEL_STANDARD "标准"
IDS_ACCEL_BASIC "基本"
IDS_ACCEL_EMULATION "软件模拟"
+ IDS_DRIVER_PULSE "PulseAudio 驱动"
IDS_DRIVER_ALSA "ALSA 驱动"
IDS_DRIVER_ESOUND "EsounD 驱动"
IDS_DRIVER_OSS "OSS 驱动"
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index 8e966a5..9c2cde3 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -88,6 +88,7 @@ typedef struct
} AUDIO_DRIVER;
static const AUDIO_DRIVER sAudioDrivers[] = {
+ {IDS_DRIVER_PULSE, "pulse"},
{IDS_DRIVER_ALSA, "alsa"},
{IDS_DRIVER_OSS, "oss"},
{IDS_DRIVER_COREAUDIO, "coreaudio"},
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c
index 6abe04d..2fa6a95 100644
--- a/programs/winecfg/libraries.c
+++ b/programs/winecfg/libraries.c
@@ -67,6 +67,7 @@ static const char * const builtin_only[] =
"user32",
"vdmdbg",
"w32skrnl",
+ "winepulse.drv",
"winealsa.drv",
"wineaudioio.drv",
"wined3d",
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index a18fe76..1c4a1e7 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -182,7 +182,7 @@
#define IDS_ACCEL_BASIC 8302
#define IDS_ACCEL_EMULATION 8303
#define IDS_DRIVER_ALSA 8304
-
+#define IDS_DRIVER_PULSE 8305
#define IDS_DRIVER_ESOUND 8306
#define IDS_DRIVER_OSS 8307
#define IDS_DRIVER_JACK 8308

2
sources
Unescape View File

@ -1 +1 @@
2ba8d6bcddf2b969da0281f867b713dd wine-1.1.14-fe.tar.bz2
cfeb6cfd7404c2fed2c9f2623976ea7e wine-1.1.15-fe.tar.bz2

27
wine-alsa-pulseaudio.patch
Unescape View File

@ -1,27 +0,0 @@
diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c
index f4452e5..34ab57a 100644
--- a/dlls/winealsa.drv/waveout.c
+++ b/dlls/winealsa.drv/waveout.c
@@ -570,7 +570,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
snd_pcm_access_t access;
snd_pcm_format_t format = -1;
unsigned int rate;
- unsigned int buffer_time = 500000;
+ unsigned int buffer_time = 120000;
unsigned int period_time = 10000;
snd_pcm_uframes_t buffer_size;
snd_pcm_uframes_t period_size;
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index 31078cb..ad08fae 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -91,7 +91,7 @@ HRESULT mmErr(UINT err)
/* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */
int ds_emuldriver = 0;
int ds_hel_buflen = 32768;
-int ds_snd_queue_max = 10;
+int ds_snd_queue_max = 12;
int ds_snd_queue_min = 6;
int ds_snd_shadow_maxsize = 2;
int ds_hw_accel = DS_HW_ACCEL_FULL;

1204
wine-pulseaudio-waveout.patch
View File

File diff suppressed because it is too large Load Diff

49
wine-pulseaudio-winecfg.patch
Unescape View File

@ -1,49 +0,0 @@
diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc
index 1a07d71..7f45434 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -276,6 +276,7 @@ BEGIN
IDS_DRIVER_NAS "NAS Driver"
IDS_DRIVER_AUDIOIO "Audio IO (Solaris) Driver"
IDS_DRIVER_COREAUDIO "CoreAudio Driver"
+ IDS_DRIVER_PULSE "PulseAudio Driver"
IDS_OPEN_DRIVER_ERROR "Couldn't open %s!"
IDS_SOUNDDRIVERS "Sound Drivers"
IDS_DEVICES_WAVEOUT "Wave Out Devices"
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index 3ce0e25..b716d25 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -95,6 +95,7 @@ static const AUDIO_DRIVER sAudioDrivers[] = {
{IDS_DRIVER_NAS, "nas"},
{IDS_DRIVER_ESOUND, "esd"},
{IDS_DRIVER_AUDIOIO, "audioio"},
+ {IDS_DRIVER_PULSE, "pulse"},
{0, ""}
};
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c
index 92dd970..42b6e41 100644
--- a/programs/winecfg/libraries.c
+++ b/programs/winecfg/libraries.c
@@ -79,6 +79,7 @@ static const char * const builtin_only[] =
"wineoss.drv",
"wineps",
"wineps.drv",
+ "winepulse.drv",
"winex11.drv",
"winmm",
"wintab32",
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index 2182c29..b8f07fb 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -180,6 +180,7 @@
#define IDS_ACCEL_BASIC 8302
#define IDS_ACCEL_EMULATION 8303
#define IDS_DRIVER_ALSA 8304
+#define IDS_DRIVER_PULSE 8305
#define IDS_DRIVER_ESOUND 8306
#define IDS_DRIVER_OSS 8307

1188
wine-pulseaudio.patch
View File

File diff suppressed because it is too large Load Diff

7
wine-pulseaudio.sh
Unescape View File

@ -1,7 +0,0 @@
#!/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_bin "$@"
else
exec /usr/bin/wine_bin "$@"
fi

28
wine.spec
Unescape View File

@ -1,5 +1,5 @@
Name: wine
Version: 1.1.14
Version: 1.1.15
Release: 1%{?dist}
Summary: A Windows 16/32/64 bit emulator
@ -41,9 +41,10 @@ Source300: wine-mime-msi.desktop
# explain how to use wine with pulseaudio
# see http://bugs.winehq.org/show_bug.cgi?id=10495
Patch400: wine-pulseaudio.patch
Patch401: wine-pulseaudio-waveout.patch
Patch402: wine-pulseaudio-winecfg.patch
# and http://art.ified.ca/?page_id=40
Patch400: http://art.ified.ca/downloads/winepulse-0.17-configure.ac.patch
Patch401: http://art.ified.ca/downloads/winepulse-0.20.patch
Patch402: http://art.ified.ca/downloads/adding-pulseaudio-to-winecfg.patch
Source402: README-FEDORA-PULSEAUDIO
@ -242,25 +243,19 @@ wine audio driver. Please do not report bugs regarding this driver at winehq.org
%patch400 -p1
%patch401 -p1
%patch402 -p1
autoconf -f
autoreconf
%build
# work around gcc bug see #440139
# this affects more then just dlls/user32/menu.c
#%if %{?fedora} > 8
#export CFLAGS="$RPM_OPT_FLAGS -fno-tree-fre -fno-tree-pre"
#%else
export CFLAGS="$RPM_OPT_FLAGS"
#%endif
%configure \
--sysconfdir=%{_sysconfdir}/wine --disable-static \
--sysconfdir=%{_sysconfdir}/wine \
--x-includes=%{_includedir} --x-libraries=%{_libdir} \
--with-pulse
%{__make} depend
%{__make} %{?_smp_mflags}
%{__make} TARGETFLAGS="" %{?_smp_mflags}
%install
rm -rf %{buildroot}
@ -869,11 +864,16 @@ update-desktop-database &>/dev/null || :
%{_libdir}/wine/*.def
%files pulseaudio
# pulseaudio workaround documentation
# winepulse documentation
%doc README-FEDORA-PULSEAUDIO
%{_libdir}/wine/winepulse.drv.so
%changelog
* Sun Feb 15 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.1.15-1
- version upgrade
- new pulse patches
* Sat Jan 31 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.1.14-1
- version upgrade

54
winepulse-0.17-configure.ac.patch
Unescape View File

@ -0,0 +1,54 @@
diff --git a/configure.ac b/configure.ac
index 57ec39d..2ca94ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,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])
+AC_ARG_WITH(pulse, AC_HELP_STRING([--without-pulse],[do not use PulseAudio sound support]))
AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
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])
@@ -1186,6 +1187,24 @@ then
CFLAGS="$save_CFLAGS"
fi
+dnl **** Check for PulseAudio ****
+if test "x$with_pulse" != "xno"; then
+ if test "$PKG_CONFIG" != "false"; then
+ AC_MSG_CHECKING([for pulseaudio >= 0.9.8])
+ if "$PKG_CONFIG" --atleast-version=0.9.8 libpulse; then
+ have_pulseaudio="yes"
+ else
+ have_pulseaudio="no"
+ fi
+ AC_MSG_RESULT([$have_pulseaudio])
+ if test x"$have_pulseaudio" = xyes; then
+ ac_pulse_libs=`$PKG_CONFIG --libs libpulse`
+ AC_DEFINE([HAVE_PULSEAUDIO], 1, [define this if you have pulseaudio])
+ AC_SUBST(PULSELIBS, "$ac_pulse_libs")
+ fi
+ fi
+fi
+
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"
@@ -1291,7 +1310,7 @@ dnl **** Check for libodbc ****
WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])
dnl **** Check for any sound system ****
-if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
+if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$PULSELIBS$ac_cv_lib_soname_jack" = "x" -a \
"$ac_cv_header_sys_soundcard_h" != "yes" -a \
"$ac_cv_header_machine_soundcard_h" != "yes" -a \
"$ac_cv_header_soundcard_h" != "yes" -a \
@@ -2223,6 +2242,7 @@ WINE_CONFIG_MAKEFILE([dlls/winemp3.acm/Makefile],[dlls/Makedll.rules],[dlls],[AL
WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/wineps.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winepulse.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winequartz.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/wing32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])

3436
winepulse-0.20.patch
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save