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

- fix steam regression

Browse Source 
- winepulse winecfg update
f38
Andreas Bierfert 16 years ago
parent bbc84be179
commit adce98c2f9
4 changed files with 126 additions and 64 deletions
Show Stats Download Patch File Download Diff File

10
pulseaudio-winecfg-update.patch
Unescape View File

@ -1,10 +0,0 @@
--- programs/winecfg/Ja.rc.orig 2009-08-26 11:55:56.000000000 +0200
+++ programs/winecfg/Ja.rc 2009-08-26 11:56:52.000000000 +0200
@@ -275,6 +275,7 @@
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 ドライバ"

25
steam-regression.patch
Unescape View File

@ -0,0 +1,25 @@
--- a/dlls/winex11.drv/bitmap.c
+++ b/dlls/winex11.drv/bitmap.c
@@ -110,10 +110,6 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
if (physDev->depth != physBitmap->pixmap_depth)
{
physDev->depth = physBitmap->pixmap_depth;
- if(physDev->depth == 1)
- physDev->color_shifts = NULL;
- else
- physDev->color_shifts = &physBitmap->pixmap_color_shifts;
wine_tsx11_lock();
XFreeGC( gdi_display, physDev->gc );
physDev->gc = XCreateGC( gdi_display, physDev->drawable, 0, NULL );
@@ -122,6 +118,12 @@ HBITMAP CDECL X11DRV_SelectBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
XFlush( gdi_display );
wine_tsx11_unlock();
}
+
+ if(physDev->depth == 1)
+ physDev->color_shifts = NULL;
+ else
+ physDev->color_shifts = &physBitmap->pixmap_color_shifts;
+
return hbitmap;
}

19
wine.spec
Unescape View File

@ -1,7 +1,7 @@
%define no64bit 0
Name: wine
Version: 1.1.29
Release: 2%{?dist}
Release: 3%{?dist}
Summary: A Windows 16/32/64 bit emulator
Group: Applications/Emulators
@ -49,11 +49,16 @@ Source300: wine-mime-msi.desktop
# and http://art.ified.ca/?page_id=40
Patch400: http://art.ified.ca/downloads/winepulse-0.30-configure.ac.patch
Patch401: http://art.ified.ca/downloads/winepulse-0.30.patch
Patch402: http://art.ified.ca/downloads/adding-pulseaudio-to-winecfg-0.4.patch
Patch402: http://art.ified.ca/downloads/winepulse/winepulse-winecfg-0.6.patch
Source402: README-FEDORA-PULSEAUDIO
Patch403: pulseaudio-winecfg-update.patch
Patch1: wine-rpath.patch
# bugfix patches
# fix steam regression http://bugs.winehq.org/show_bug.cgi?id=19916
# upstream commit 70241904b9efacab9fb6c7d8701b1cfdb86f49f7
Patch1000: steam-regression.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if !%{?no64bit}
@ -301,7 +306,8 @@ This package adds an oss driver for wine.
%patch400 -p1
%patch401 -p1
%patch402 -p1
%patch403
%patch1000 -p1
autoreconf
@ -1025,6 +1031,11 @@ update-desktop-database &>/dev/null || :
%{_libdir}/wine/wineoss.drv.so
%changelog
* Sun Sep 13 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.1.29-3
- patch for steam regression (upstream #19916)
- update winepulse winecfg patch
* Thu Sep 10 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.1.29-2
- rebuild for new gcc (#505862)

136
adding-pulseaudio-to-winecfg-0.4.patch → winepulse-winecfg-0.6.patch
Unescape View File

@ -1,92 +1,92 @@
diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc
index fcdf895..e17690e 100644
index fcdf895..ec24068 100644
--- a/programs/winecfg/Bg.rc
+++ b/programs/winecfg/Bg.rc
@@ -276,6 +276,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
+ IDS_DRIVER_PULSE "PulseAudio Driver"
+ 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 d9c0b28..9bcc033 100644
index d9c0b28..6171f1f 100644
--- a/programs/winecfg/Cs.rc
+++ b/programs/winecfg/Cs.rc
@@ -276,6 +276,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standardní"
IDS_ACCEL_BASIC "Základní"
IDS_ACCEL_EMULATION "Emulace"
+ IDS_DRIVER_PULSE "Ovladaè PulseAudio"
+ 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 f53aead..690c7f5 100644
index f53aead..e33bd78 100644
--- a/programs/winecfg/Da.rc
+++ b/programs/winecfg/Da.rc
@@ -270,6 +270,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Grundlæggende"
IDS_ACCEL_EMULATION "Emuléring"
+ IDS_DRIVER_PULSE "PulseAudio-driver"
+ 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 e6bed15..d3027bc 100644
index aadd21e..f3016ab 100644
--- a/programs/winecfg/De.rc
+++ b/programs/winecfg/De.rc
@@ -272,6 +272,7 @@ BEGIN
@@ -282,6 +282,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Einfach"
IDS_ACCEL_EMULATION "Emulation"
+ IDS_DRIVER_PULSE "PulseAudio-Treiber"
+ 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 049aaa7..cef7c4a 100644
index 6aa5120..6f30805 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -272,6 +272,7 @@ BEGIN
@@ -282,6 +282,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
+ IDS_DRIVER_PULSE "PulseAudio Driver"
+ 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 1771b4e..c49f9a3 100644
index 1771b4e..aaacaa9 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -270,6 +270,7 @@ BEGIN
IDS_ACCEL_STANDARD "Estándar"
IDS_ACCEL_BASIC "Básica"
IDS_ACCEL_EMULATION "Emulación"
+ IDS_DRIVER_PULSE "Manejador PulseAudio"
+ 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 0dedf3a..097a4d2 100644
index 0dedf3a..5217482 100644
--- a/programs/winecfg/Fi.rc
+++ b/programs/winecfg/Fi.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_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 52c9888..1bd92b1 100644
index a9184f9..004ebb0 100644
--- a/programs/winecfg/Fr.rc
+++ b/programs/winecfg/Fr.rc
@@ -274,6 +274,7 @@ BEGIN
@@ -284,6 +284,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Basique"
IDS_ACCEL_EMULATION "Émulation"
@ -95,62 +95,98 @@ index 52c9888..1bd92b1 100644
IDS_DRIVER_ESOUND "Pilote EsounD"
IDS_DRIVER_OSS "Pilote OSS"
diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc
index dc887fe..3ba696f 100644
index dc887fe..9bd192e 100644
--- a/programs/winecfg/Hu.rc
+++ b/programs/winecfg/Hu.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_PULSE "PulseAudio Driver"
IDS_DRIVER_ALSA "ALSA Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc
index ddeda8c..1530b5f 100644
--- a/programs/winecfg/It.rc
+++ b/programs/winecfg/It.rc
@@ -284,6 +284,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Base"
IDS_ACCEL_EMULATION "Emulazione"
+ 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/Ja.rc b/programs/winecfg/Ja.rc
index 5b77da7..316d2e5 100644
--- a/programs/winecfg/Ja.rc
+++ b/programs/winecfg/Ja.rc
@@ -285,6 +285,7 @@ BEGIN
IDS_ACCEL_STANDARD "標準"
IDS_ACCEL_BASIC "基本"
IDS_ACCEL_EMULATION "エミュレーション"
+ IDS_DRIVER_PULSE "PulseAudio ドライãƒ<C3A3>"
IDS_DRIVER_ALSA "ALSA ドライãƒ<C3A3>"
IDS_DRIVER_ESOUND "EsounD ドライãƒ<C3A3>"
IDS_DRIVER_OSS "OSS ドライãƒ<C3A3>"
diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc
index 6f13e0c..d5403da 100644
index bf06647..66f9803 100644
--- a/programs/winecfg/Ko.rc
+++ b/programs/winecfg/Ko.rc
@@ -274,6 +274,7 @@ BEGIN
@@ -285,6 +285,7 @@ BEGIN
IDS_ACCEL_STANDARD "Ç¥ÁØ"
IDS_ACCEL_BASIC "񃧯"
IDS_ACCEL_EMULATION "¾Ö¹Ä·¹À̼Ç"
+ IDS_DRIVER_PULSE "PulseAudio µå¶óÀ̹ö"
+ IDS_DRIVER_PULSE "PulseAudio µå¶óÀ̹ö"
IDS_DRIVER_ALSA "ALSA µå¶óÀ̹ö"
IDS_DRIVER_ESOUND "EsounD µå¶óÀ̹ö"
IDS_DRIVER_OSS "OSS µå¶óÀ̹ö"
diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc
index 7208cc6..5aa8fdb 100644
--- a/programs/winecfg/Lt.rc
+++ b/programs/winecfg/Lt.rc
@@ -283,6 +283,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standartinis"
IDS_ACCEL_BASIC "Bazinis"
IDS_ACCEL_EMULATION "Emuliacija"
+ IDS_DRIVER_PULSE "PulseAudio tvarkyklÄ—"
IDS_DRIVER_ALSA "ALSA tvarkyklÄ—"
IDS_DRIVER_ESOUND "EsounD tvarkyklÄ—"
IDS_DRIVER_OSS "OSS tvarkyklÄ—"
diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc
index 4cd45f0..d23f359 100644
index 2fbba6a..802abab 100644
--- a/programs/winecfg/Nl.rc
+++ b/programs/winecfg/Nl.rc
@@ -273,6 +273,7 @@ BEGIN
@@ -283,6 +283,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standaard"
IDS_ACCEL_BASIC "Eenvoudig"
IDS_ACCEL_EMULATION "Emulatie"
+ IDS_DRIVER_PULSE "PulseAudio Stuurprogramma"
+ 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 cc34fad..71876ba 100644
index cc34fad..0f0aea8 100644
--- a/programs/winecfg/No.rc
+++ b/programs/winecfg/No.rc
@@ -270,6 +270,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Grunnleggende"
IDS_ACCEL_EMULATION "Emulering"
+ IDS_DRIVER_PULSE "PulseAudio-driver"
+ 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 d884881..d6405b1 100644
index d884881..bb97de5 100644
--- a/programs/winecfg/Pl.rc
+++ b/programs/winecfg/Pl.rc
@@ -273,6 +273,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standardowe"
IDS_ACCEL_BASIC "Podstawowe"
IDS_ACCEL_EMULATION "Emulacja"
+ IDS_DRIVER_PULSE "Sterownik PulseAudio"
+ IDS_DRIVER_PULSE "Sterownik PulseAudio"
IDS_DRIVER_ALSA "Sterownik ALSA"
IDS_DRIVER_ESOUND "Sterownik EsounD"
IDS_DRIVER_OSS "Sterownik OSS"
@ -167,86 +203,86 @@ index 683dc68..be92466 100644
IDS_DRIVER_ESOUND "Controlador EsounD"
IDS_DRIVER_OSS "Controlador OSS"
diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc
index f12949f..2101ea1 100644
index 5626018..6c84511 100644
--- a/programs/winecfg/Ro.rc
+++ b/programs/winecfg/Ro.rc
@@ -272,6 +272,7 @@ BEGIN
@@ -282,6 +282,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "De bază"
IDS_ACCEL_EMULATION "Emulare"
+ IDS_DRIVER_PULSE "Driver PulseAudio"
+ 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 7293cbc..fb57527 100644
index 38b4546..73c0250 100644
--- a/programs/winecfg/Ru.rc
+++ b/programs/winecfg/Ru.rc
@@ -277,6 +277,7 @@ BEGIN
@@ -287,6 +287,7 @@ BEGIN
IDS_ACCEL_STANDARD "Стандартное"
IDS_ACCEL_BASIC "Минимальное"
IDS_ACCEL_EMULATION "ЭмулÑ<C2BB>циÑ<C2B8>"
+ IDS_DRIVER_PULSE "PulseAudio драйвер"
+ 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 feaef36..c26e5cb 100644
index feaef36..1d10bae 100644
--- a/programs/winecfg/Si.rc
+++ b/programs/winecfg/Si.rc
@@ -272,6 +272,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standardno"
IDS_ACCEL_BASIC "Osnovno"
IDS_ACCEL_EMULATION "Emulacija"
+ IDS_DRIVER_PULSE "PulseAudio gonilnik"
+ 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 7fea5aa..35eb871 100644
index 7fea5aa..1979b5a 100644
--- a/programs/winecfg/Sv.rc
+++ b/programs/winecfg/Sv.rc
@@ -270,6 +270,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Grundläggande"
IDS_ACCEL_EMULATION "Emulering"
+ IDS_DRIVER_PULSE "PulseAudio-drivrutin"
+ 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 0fa9778..2a23112 100644
index 0fa9778..5ea7da1 100644
--- a/programs/winecfg/Tr.rc
+++ b/programs/winecfg/Tr.rc
@@ -270,6 +270,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standart"
IDS_ACCEL_BASIC "Temel"
IDS_ACCEL_EMULATION "Taklit"
+ IDS_DRIVER_PULSE "PulseAudio Sürücüsü"
+ 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 fea66b7..bc0aaaf 100644
index 8c84061..3de1da8 100644
--- a/programs/winecfg/Zh.rc
+++ b/programs/winecfg/Zh.rc
@@ -273,6 +273,7 @@ BEGIN
@@ -275,6 +275,7 @@ BEGIN
IDS_ACCEL_STANDARD "标准"
IDS_ACCEL_BASIC "基本"
IDS_ACCEL_EMULATION "软件模拟"
+ IDS_DRIVER_PULSE "PulseAudio 驱动"
+ 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 9f8a0a2..0ecb6c3 100644
index 9f8a0a2..59837ef 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -89,6 +89,7 @@ typedef struct
} AUDIO_DRIVER;
static const AUDIO_DRIVER sAudioDrivers[] = {
+ {IDS_DRIVER_PULSE, "pulse"},
+ {IDS_DRIVER_PULSE, "pulse"},
{IDS_DRIVER_ALSA, "alsa"},
{IDS_DRIVER_OSS, "oss"},
{IDS_DRIVER_COREAUDIO, "coreaudio"},
@ -263,15 +299,15 @@ index 37cc12b..7c13fad 100644
"winmm",
"wintab32",
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index 27736b7..f8ba2ee 100644
index f006861..57b2a15 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -185,7 +185,7 @@
@@ -187,7 +187,7 @@
#define IDS_ACCEL_BASIC 8302
#define IDS_ACCEL_EMULATION 8303
#define IDS_DRIVER_ALSA 8304
-
+#define IDS_DRIVER_PULSE 8305
+#define IDS_DRIVER_PULSE 8305
#define IDS_DRIVER_ESOUND 8306
#define IDS_DRIVER_OSS 8307
#define IDS_DRIVER_JACK 8308
Write Preview
Loading…
Cancel
Save