From 85de186e6aa14497aa2b4b2f36888a1d9ad94efc Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Sun, 30 Aug 2009 21:27:14 +0000 Subject: [PATCH] - lots of fixes - version upgrade - 64bit build --- .cvsignore | 2 +- ... => adding-pulseaudio-to-winecfg-0.4.patch | 112 +++---- noautobuild | 1 - pulseaudio-winecfg-update.patch | 10 + sources | 2 +- wine-rpath.patch | 34 +- wine.spec | 310 ++++++++++++------ ...patch => winepulse-0.30-configure.ac.patch | 32 +- winepulse-0.29.patch => winepulse-0.30.patch | 13 +- 9 files changed, 314 insertions(+), 202 deletions(-) rename adding-pulseaudio-to-winecfg-0.3.patch => adding-pulseaudio-to-winecfg-0.4.patch (84%) delete mode 100644 noautobuild create mode 100644 pulseaudio-winecfg-update.patch rename winepulse-0.29-configure.ac.patch => winepulse-0.30-configure.ac.patch (75%) rename winepulse-0.29.patch => winepulse-0.30.patch (99%) diff --git a/.cvsignore b/.cvsignore index 36f3eca..3de7483 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wine-1.1.26-fe.tar.bz2 +wine-1.1.28-fe.tar.bz2 diff --git a/adding-pulseaudio-to-winecfg-0.3.patch b/adding-pulseaudio-to-winecfg-0.4.patch similarity index 84% rename from adding-pulseaudio-to-winecfg-0.3.patch rename to adding-pulseaudio-to-winecfg-0.4.patch index 7ee1060..3600a57 100644 --- a/adding-pulseaudio-to-winecfg-0.3.patch +++ b/adding-pulseaudio-to-winecfg-0.4.patch @@ -1,8 +1,8 @@ diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc -index 00cfbe8..ce2c8c7 100644 +index fcdf895..e17690e 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc -@@ -277,6 +277,7 @@ BEGIN +@@ -276,6 +276,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Basic" IDS_ACCEL_EMULATION "Emulation" @@ -11,10 +11,10 @@ index 00cfbe8..ce2c8c7 100644 IDS_DRIVER_ESOUND "EsounD Driver" IDS_DRIVER_OSS "OSS Driver" diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc -index b34dd06..348153c 100644 +index d9c0b28..9bcc033 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc -@@ -277,6 +277,7 @@ BEGIN +@@ -276,6 +276,7 @@ BEGIN IDS_ACCEL_STANDARD "Standardn" IDS_ACCEL_BASIC "Zkladn" IDS_ACCEL_EMULATION "Emulace" @@ -23,10 +23,10 @@ index b34dd06..348153c 100644 IDS_DRIVER_ESOUND "Ovlada EsounD" IDS_DRIVER_OSS "Ovlada OSS" diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc -index 62b781b..a604ea3 100644 +index f53aead..690c7f5 100644 --- a/programs/winecfg/Da.rc +++ b/programs/winecfg/Da.rc -@@ -271,6 +271,7 @@ BEGIN +@@ -270,6 +270,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Grundlggende" IDS_ACCEL_EMULATION "Emulring" @@ -35,10 +35,10 @@ index 62b781b..a604ea3 100644 IDS_DRIVER_ESOUND "EsounD-driver" IDS_DRIVER_OSS "OSS-driver" diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc -index 53c412c..8f70399 100644 +index e6bed15..d3027bc 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc -@@ -273,6 +273,7 @@ BEGIN +@@ -272,6 +272,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Einfach" IDS_ACCEL_EMULATION "Emulation" @@ -47,10 +47,10 @@ index 53c412c..8f70399 100644 IDS_DRIVER_ESOUND "EsounD-Treiber" IDS_DRIVER_OSS "OSS-Treiber" diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc -index a69b4d9..2d3dc5c 100644 +index 049aaa7..cef7c4a 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc -@@ -273,6 +273,7 @@ BEGIN +@@ -272,6 +272,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Basic" IDS_ACCEL_EMULATION "Emulation" @@ -59,10 +59,10 @@ index a69b4d9..2d3dc5c 100644 IDS_DRIVER_ESOUND "EsounD Driver" IDS_DRIVER_OSS "OSS Driver" diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc -index 2ddce6c..ececfe2 100644 +index 1771b4e..c49f9a3 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc -@@ -271,6 +271,7 @@ BEGIN +@@ -270,6 +270,7 @@ BEGIN IDS_ACCEL_STANDARD "Estndar" IDS_ACCEL_BASIC "Bsica" IDS_ACCEL_EMULATION "Emulacin" @@ -71,10 +71,10 @@ index 2ddce6c..ececfe2 100644 IDS_DRIVER_ESOUND "Manejador EsounD" IDS_DRIVER_OSS "Manejador OSS" diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc -index f6fb85c..ed24bf6 100644 +index 0dedf3a..097a4d2 100644 --- a/programs/winecfg/Fi.rc +++ b/programs/winecfg/Fi.rc -@@ -271,6 +271,7 @@ BEGIN +@@ -270,6 +270,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Basic" IDS_ACCEL_EMULATION "Emulation" @@ -83,10 +83,10 @@ index f6fb85c..ed24bf6 100644 IDS_DRIVER_ESOUND "EsounD Driver" IDS_DRIVER_OSS "OSS Driver" diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc -index b63adb1..414f440 100644 +index 52c9888..1bd92b1 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc -@@ -275,6 +275,7 @@ BEGIN +@@ -274,6 +274,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Basique" IDS_ACCEL_EMULATION "Émulation" @@ -95,10 +95,10 @@ index b63adb1..414f440 100644 IDS_DRIVER_ESOUND "Pilote EsounD" IDS_DRIVER_OSS "Pilote OSS" diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc -index 0445c77..7756d2b 100644 +index dc887fe..3ba696f 100644 --- a/programs/winecfg/Hu.rc +++ b/programs/winecfg/Hu.rc -@@ -271,6 +271,7 @@ BEGIN +@@ -270,6 +270,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Basic" IDS_ACCEL_EMULATION "Emulation" @@ -106,23 +106,11 @@ index 0445c77..7756d2b 100644 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 a25a953..d690f7f 100644 ---- a/programs/winecfg/Ja.rc -+++ b/programs/winecfg/Ja.rc -@@ -276,6 +276,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 c01b841..5c500d5 100644 +index 6f13e0c..d5403da 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc -@@ -275,6 +275,7 @@ BEGIN +@@ -274,6 +274,7 @@ BEGIN IDS_ACCEL_STANDARD "ǥ" IDS_ACCEL_BASIC "⺻" IDS_ACCEL_EMULATION "ֹķ̼" @@ -131,7 +119,7 @@ index c01b841..5c500d5 100644 IDS_DRIVER_ESOUND "EsounD ̹" IDS_DRIVER_OSS "OSS ̹" diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc -index 99062cf..2683a82 100644 +index 4cd45f0..d23f359 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -273,6 +273,7 @@ BEGIN @@ -143,10 +131,10 @@ index 99062cf..2683a82 100644 IDS_DRIVER_ESOUND "EsounD Stuurprogramma" IDS_DRIVER_OSS "OSS Stuurprogramma" diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc -index 357539e..b2a5eae 100644 +index cc34fad..71876ba 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc -@@ -271,6 +271,7 @@ BEGIN +@@ -270,6 +270,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Grunnleggende" IDS_ACCEL_EMULATION "Emulering" @@ -155,10 +143,10 @@ index 357539e..b2a5eae 100644 IDS_DRIVER_ESOUND "EsounD-driver" IDS_DRIVER_OSS "OSS-driver" diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc -index 8e1d9a2..bd968de 100644 +index d884881..d6405b1 100644 --- a/programs/winecfg/Pl.rc +++ b/programs/winecfg/Pl.rc -@@ -274,6 +274,7 @@ BEGIN +@@ -273,6 +273,7 @@ BEGIN IDS_ACCEL_STANDARD "Standardowe" IDS_ACCEL_BASIC "Podstawowe" IDS_ACCEL_EMULATION "Emulacja" @@ -167,10 +155,10 @@ index 8e1d9a2..bd968de 100644 IDS_DRIVER_ESOUND "Sterownik EsounD" IDS_DRIVER_OSS "Sterownik OSS" diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc -index e3b02a1..be5acb0 100644 +index 683dc68..be92466 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc -@@ -471,6 +471,7 @@ BEGIN +@@ -470,6 +470,7 @@ BEGIN IDS_ACCEL_STANDARD "Padrão" IDS_ACCEL_BASIC "Básico" IDS_ACCEL_EMULATION "Emulação" @@ -179,10 +167,10 @@ index e3b02a1..be5acb0 100644 IDS_DRIVER_ESOUND "Controlador EsounD" IDS_DRIVER_OSS "Controlador OSS" diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc -index c836d60..50317bf 100644 +index f12949f..2101ea1 100644 --- a/programs/winecfg/Ro.rc +++ b/programs/winecfg/Ro.rc -@@ -273,6 +273,7 @@ BEGIN +@@ -272,6 +272,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "De bază" IDS_ACCEL_EMULATION "Emulare" @@ -191,22 +179,22 @@ index c836d60..50317bf 100644 IDS_DRIVER_ESOUND "Driver Esound" IDS_DRIVER_OSS "Driver OSS" diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc -index 8d61413..7962c98 100644 +index 7293cbc..fb57527 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc -@@ -275,6 +275,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 " +@@ -277,6 +277,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 87cd239..73544bb 100644 +index feaef36..c26e5cb 100644 --- a/programs/winecfg/Si.rc +++ b/programs/winecfg/Si.rc -@@ -273,6 +273,7 @@ BEGIN +@@ -272,6 +272,7 @@ BEGIN IDS_ACCEL_STANDARD "Standardno" IDS_ACCEL_BASIC "Osnovno" IDS_ACCEL_EMULATION "Emulacija" @@ -215,10 +203,10 @@ index 87cd239..73544bb 100644 IDS_DRIVER_ESOUND "EsounD gonilnik" IDS_DRIVER_OSS "OSS gonilnik" diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc -index 113603c..dde6ed5 100644 +index 7fea5aa..35eb871 100644 --- a/programs/winecfg/Sv.rc +++ b/programs/winecfg/Sv.rc -@@ -271,6 +271,7 @@ BEGIN +@@ -270,6 +270,7 @@ BEGIN IDS_ACCEL_STANDARD "Standard" IDS_ACCEL_BASIC "Grundlggande" IDS_ACCEL_EMULATION "Emulering" @@ -227,10 +215,10 @@ index 113603c..dde6ed5 100644 IDS_DRIVER_ESOUND "EsounD-drivrutin" IDS_DRIVER_OSS "OSS-drivrutin" diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc -index 883c0f3..4f6ecb3 100644 +index 0fa9778..2a23112 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc -@@ -271,6 +271,7 @@ BEGIN +@@ -270,6 +270,7 @@ BEGIN IDS_ACCEL_STANDARD "Standart" IDS_ACCEL_BASIC "Temel" IDS_ACCEL_EMULATION "Taklit" @@ -239,10 +227,10 @@ index 883c0f3..4f6ecb3 100644 IDS_DRIVER_ESOUND "EsounD Srcs" IDS_DRIVER_OSS "OSS Srcs" diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc -index b483cfe..8617049 100644 +index fea66b7..bc0aaaf 100644 --- a/programs/winecfg/Zh.rc +++ b/programs/winecfg/Zh.rc -@@ -274,6 +274,7 @@ BEGIN +@@ -273,6 +273,7 @@ BEGIN IDS_ACCEL_STANDARD "标准" IDS_ACCEL_BASIC "基本" IDS_ACCEL_EMULATION "软件模拟" @@ -251,10 +239,10 @@ index b483cfe..8617049 100644 IDS_DRIVER_ESOUND "EsounD 驱动" IDS_DRIVER_OSS "OSS 驱动" diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c -index 79e62f0..b9a310c 100644 +index 9f8a0a2..0ecb6c3 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c -@@ -88,6 +88,7 @@ typedef struct +@@ -89,6 +89,7 @@ typedef struct } AUDIO_DRIVER; static const AUDIO_DRIVER sAudioDrivers[] = { @@ -275,10 +263,10 @@ index 37cc12b..7c13fad 100644 "winmm", "wintab32", diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h -index 88c9e64..05a13de 100644 +index 27736b7..f8ba2ee 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h -@@ -186,7 +186,7 @@ +@@ -185,7 +185,7 @@ #define IDS_ACCEL_BASIC 8302 #define IDS_ACCEL_EMULATION 8303 #define IDS_DRIVER_ALSA 8304 diff --git a/noautobuild b/noautobuild deleted file mode 100644 index e0e4c9c..0000000 --- a/noautobuild +++ /dev/null @@ -1 +0,0 @@ -transition from ix86 only build to ix86/x86_64 32bit build diff --git a/pulseaudio-winecfg-update.patch b/pulseaudio-winecfg-update.patch new file mode 100644 index 0000000..365f99d --- /dev/null +++ b/pulseaudio-winecfg-update.patch @@ -0,0 +1,10 @@ +--- 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 ドライバ" diff --git a/sources b/sources index 7efb812..c9b13b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7b2affded452ced2b1f45a9b7e6f24da wine-1.1.26-fe.tar.bz2 +6342c41f46d0571efae685c17aa5550f wine-1.1.28-fe.tar.bz2 diff --git a/wine-rpath.patch b/wine-rpath.patch index 0836ea1..06e1045 100644 --- a/wine-rpath.patch +++ b/wine-rpath.patch @@ -1,32 +1,32 @@ ---- configure.orig 2008-11-05 12:25:10.000000000 +0300 -+++ configure 2008-11-06 22:22:27.000000000 +0300 -@@ -9306,14 +9306,14 @@ - fi +--- configure.orig 2009-08-26 11:47:17.000000000 +0200 ++++ configure 2009-08-26 11:50:07.000000000 +0200 +@@ -6565,14 +6565,14 @@ + fi -- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\$ORIGIN/../lib" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5 +- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5 -$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; } + as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC" >&5 -+$as_echo_n "checking whether the compiler supports -fPIC" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC" >&5 ++$as_echo_n "checking whether the compiler supports -fPIC " >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib" +CFLAGS="$CFLAGS -fPIC" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -9369,8 +9369,8 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -6597,8 +6597,8 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - if test `eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` = yes; then + if test `eval 'as_val=${'$as_ac_var'};$as_echo "$as_val"'` = yes; then : - LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`" - LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine" + LDRPATH_INSTALL="" + LDRPATH_LOCAL="" else - as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\$ORIGIN/../lib" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5 + as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5 diff --git a/wine.spec b/wine.spec index 1e6dc2d..0f96350 100644 --- a/wine.spec +++ b/wine.spec @@ -1,5 +1,6 @@ +%define no64bit 0 Name: wine -Version: 1.1.26 +Version: 1.1.28 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -22,6 +23,8 @@ Source0: %{name}-%{version}-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf +Source5: wine-64.conf +Source6: wine-chooser.sh # desktop stuff Source100: wine-notepad.desktop Source101: wine-regedit.desktop @@ -44,24 +47,25 @@ Source300: wine-mime-msi.desktop # explain how to use wine with pulseaudio # see http://bugs.winehq.org/show_bug.cgi?id=10495 # and http://art.ified.ca/?page_id=40 -Patch400: http://art.ified.ca/downloads/winepulse-0.29-configure.ac.patch -Patch401: http://art.ified.ca/downloads/winepulse-0.29.patch -Patch402: http://art.ified.ca/downloads/adding-pulseaudio-to-winecfg-0.3.patch +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 Source402: README-FEDORA-PULSEAUDIO - +Patch403: pulseaudio-winecfg-update.patch Patch1: wine-rpath.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if !%{?no64bit} +ExclusiveArch: %{ix86} x86_64 +%else ExclusiveArch: %{ix86} +%endif -# BR: All builds -BuildRequires: bison -BuildRequires: flex +BuildRequires: bison +BuildRequires: flex BuildRequires: autoconf BuildRequires: desktop-file-utils - -# x86-32 BR BuildRequires: alsa-lib-devel BuildRequires: audiofile-devel BuildRequires: esound-devel @@ -80,7 +84,7 @@ BuildRequires: unixODBC-devel BuildRequires: openssl-devel BuildRequires: sane-backends-devel BuildRequires: zlib-devel -BuildRequires: fontforge +BuildRequires: fontforge freetype-devel BuildRequires: libgphoto2-devel BuildRequires: jack-audio-connection-kit-devel # #217338 @@ -102,15 +106,27 @@ BuildRequires: libXcursor-devel BuildRequires: dbus-devel hal-devel BuildRequires: gnutls-devel BuildRequires: pulseaudio-libs-devel +BuildRequires: gsm-devel -Requires: wine-core = %{version}-%{release} -Requires: wine-capi = %{version}-%{release} -Requires: wine-cms = %{version}-%{release} +# noarch +Requires: wine-common = %{version}-%{release} Requires: wine-desktop = %{version}-%{release} -Requires: wine-ldap = %{version}-%{release} -Requires: wine-tools = %{version}-%{release} -Requires: wine-twain = %{version}-%{release} -Requires: wine-pulseaudio = %{version}-%{release} +# 32bit +Requires: wine-core(x86-32) = %{version}-%{release} +Requires: wine-capi(x86-32) = %{version}-%{release} +Requires: wine-cms(x86-32) = %{version}-%{release} +Requires: wine-ldap(x86-32) = %{version}-%{release} +Requires: wine-twain(x86-32) = %{version}-%{release} +Requires: wine-pulseaudio(x86-32) = %{version}-%{release} +# 64bit +%ifarch x86_64 +Requires: wine-core(x86-64) = %{version}-%{release} +Requires: wine-capi(x86-64) = %{version}-%{release} +Requires: wine-cms(x86-64) = %{version}-%{release} +Requires: wine-ldap(x86-64) = %{version}-%{release} +Requires: wine-twain(x86-64) = %{version}-%{release} +Requires: wine-pulseaudio(x86-64) = %{version}-%{release} +%endif %description While Wine is usually thought of as a Windows(TM) emulator, the Wine @@ -127,17 +143,26 @@ wine-* sub packages. %package core Summary: Wine core package Group: Applications/Emulators +Requires: wine-fonts = %{version}-%{release} Requires: %{_bindir}/xmessage -Requires: freetype%{_isa} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Obsoletes: wine <= 0.9.15-1%{?dist} Obsoletes: wine-arts < 0.9.34 +Obsoletes: wine-tools <= 1.1.27 +Provides: wine-tools = %{version}-%{release} # fix dns resolution (#492700) # require both to be sure 64bit is present as well... -Requires: nss-mdns nss-mdns%{_isa} +%ifarch %{ix86} +Requires: freetype(x86-32) +Requires: nss-mdns(x86-32) # require Xrender isa on x86_64 (#510947) -Requires: libXrender%{_isa} +Requires: libXrender(x86-32) +%endif +%ifarch x86_64 +Requires: nss-mdns(x86-64) +Requires: freetype(x86-64) +%endif %description core Wine core package includes the basic wine stuff needed by all other packages. @@ -150,18 +175,28 @@ Requires(post): desktop-file-utils >= 0.8 Requires(preun): /sbin/chkconfig, /sbin/service Requires(postun): desktop-file-utils >= 0.8 Requires: wine-core = %{version}-%{release} +BuildArch: noarch %description desktop Desktop integration features for wine, including mime-types and a binary format handler service. -%package tools -Summary: Additional wine tools +%package fonts +Summary: Wine font files +Group: Applications/Emulators +BuildArch: noarch + +%description fonts +%{summary} + +%package common +Summary: Common files Group: Applications/Emulators Requires: wine-core = %{version}-%{release} +BuildArch: noarch -%description tools -Additional wine tools +%description common +Common wine files and scripts. %package esd Summary: ESD sound support for wine @@ -175,7 +210,12 @@ ESD sound support for wine Summary: JACK sound support for wine Group: System Environment/Libraries Requires: wine-core = %{version}-%{release} -Requires: jack-audio-connection-kit%{_isa} +%ifarch %{ix86} +Requires: jack-audio-connection-kit(x86-32) +%endif +%ifarch x86_64 +Requires: jack-audio-connection-kit(x86-64) +%endif %description jack JACK sound support for wine @@ -256,19 +296,27 @@ This package adds an oss driver for wine. %prep %setup -q -n %{name}-%{version}-fe + %patch1 %patch400 -p1 %patch401 -p1 %patch402 -p1 +%patch403 + autoreconf %build export CFLAGS="$RPM_OPT_FLAGS" - %configure \ --sysconfdir=%{_sysconfdir}/wine \ --x-includes=%{_includedir} --x-libraries=%{_libdir} \ - --with-pulse + --with-pulse \ + --with-x \ +%ifarch x86_64 + --enable-win64 \ +%endif + --enable-maintainer-mode \ + --disable-tests %{__make} depend @@ -284,6 +332,17 @@ rm -rf %{buildroot} LDCONFIG=/bin/true \ UPDATE_DESKTOP_DATABASE=/bin/true +%ifarch %{ix86} +# rename wine to wine32 +mv %{buildroot}%{_bindir}/wine{,32} +%endif + +# if x86_64 rename to wine64 +%ifarch x86_64 +mv %{buildroot}%{_bindir}/wine{,64} +%endif + + mkdir -p %{buildroot}%{_sysconfdir}/wine # Allow users to launch Windows programs by just clicking on the .exe file... @@ -366,7 +425,16 @@ desktop-file-install \ cp %{SOURCE3} README-Fedora mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ + +%ifarch %{ix86} install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ +%endif + +%ifarch x86_64 +install -p -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ +%endif + +install -p -m755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/wine # deploy pulseaudio readme cp %{SOURCE402} . @@ -430,19 +498,49 @@ update-desktop-database &>/dev/null || : %files core %defattr(-,root,root,-) -%doc ANNOUNCE COPYING.LIB LICENSE LICENSE.OLD -%doc AUTHORS README-Fedora README VERSION +%doc ANNOUNCE +%doc COPYING.LIB +%doc LICENSE +%doc LICENSE.OLD +%doc AUTHORS +%doc README-Fedora +%doc README +%doc VERSION # do not include huge changelogs .OLD .ALPHA .BETA (#204302) %doc documentation/README.* -%{_bindir}/msiexec -%{_bindir}/regedit -%{_bindir}/regsvr32 -%{_bindir}/wine -%{_bindir}/wineboot -%{_bindir}/wineconsole -%{_bindir}/wineprefixcreate -%{_mandir}/man1/wineprefixcreate.1* -%{_bindir}/winecfg + +%{_bindir}/winedump +%{_libdir}/wine/explorer.exe.so +%{_libdir}/wine/control.exe.so +%{_libdir}/wine/cmd.exe.so +%{_libdir}/wine/notepad.exe.so +%{_libdir}/wine/progman.exe.so +%{_libdir}/wine/taskmgr.exe.so +%{_libdir}/wine/winedbg.exe.so +%{_libdir}/wine/winefile.exe.so +%{_libdir}/wine/winemine.exe.so +%{_libdir}/wine/winepath.exe.so +%{_libdir}/wine/winver.exe.so +%{_libdir}/wine/wordpad.exe.so +%{_libdir}/wine/write.exe.so + +%ifarch %{ix86} +%{_bindir}/wine-preloader +%endif +%{_bindir}/wineserver + +%ifarch %{ix86} +%{_sysconfdir}/ld.so.conf.d/wine-32.conf +%{_bindir}/wine32 +%endif +%ifarch x86_64 +%{_bindir}/wine64 +%{_sysconfdir}/ld.so.conf.d/wine-64.conf +%endif + +%dir %{_libdir}/wine +%dir %{_libdir}/wine/fakedlls +%{_libdir}/wine/fakedlls/* %{_libdir}/wine/cacls.exe.so %{_libdir}/wine/expand.exe.so %{_libdir}/wine/winhlp32.exe.so @@ -463,20 +561,10 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/winebrowser.exe.so %{_libdir}/wine/wineconsole.exe.so %{_libdir}/wine/winemenubuilder.exe.so -%{_libdir}/wine/winevdm.exe.so %{_libdir}/wine/winecfg.exe.so %{_libdir}/wine/winedevice.exe.so %{_libdir}/wine/uninstaller.exe.so -%dir %{_datadir}/wine -%{_mandir}/man1/wine.1.gz -%{_mandir}/man1/wineserver.1* -%lang(fr) %{_mandir}/fr.UTF-8/man1/* -%{_datadir}/wine/generic.ppd -%{_datadir}/wine/wine.inf -%{_bindir}/wine-preloader -%{_bindir}/wineserver %{_libdir}/libwine.so.1* -%dir %{_libdir}/wine %{_libdir}/wine/acledit.dll.so %{_libdir}/wine/aclui.dll.so %{_libdir}/wine/activeds.dll.so @@ -499,7 +587,6 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/comcat.dll.so %{_libdir}/wine/comctl32.dll.so %{_libdir}/wine/comdlg32.dll.so -%{_libdir}/wine/commdlg.dll16 %{_libdir}/wine/compstui.dll.so %{_libdir}/wine/credui.dll.so %{_libdir}/wine/crtdll.dll.so @@ -549,7 +636,6 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/eject.exe.so %{_libdir}/wine/faultrep.dll.so %{_libdir}/wine/fusion.dll.so -%{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so %{_libdir}/wine/gdiplus.dll.so %{_libdir}/wine/glu32.dll.so @@ -565,7 +651,6 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/iccvid.dll.so %{_libdir}/wine/icinfo.exe.so %{_libdir}/wine/icmp.dll.so -%{_libdir}/wine/ifsmgr.vxd.so %{_libdir}/wine/imaadp32.acm.so %{_libdir}/wine/imagehlp.dll.so %{_libdir}/wine/imm32.dll.so @@ -580,7 +665,6 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/itss.dll.so %{_libdir}/wine/jscript.dll.so %{_libdir}/wine/kernel32.dll.so -%{_libdir}/wine/krnl386.exe16 %{_libdir}/wine/loadperf.dll.so %{_libdir}/wine/localspl.dll.so %{_libdir}/wine/localui.dll.so @@ -593,21 +677,21 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/mciwave.dll.so %{_libdir}/wine/midimap.dll.so %{_libdir}/wine/mlang.dll.so -%{_libdir}/wine/mmdevldr.vxd.so -%{_libdir}/wine/mmsystem.dll16 -%{_libdir}/wine/monodebg.vxd.so %{_libdir}/wine/mountmgr.sys.so %{_libdir}/wine/mpr.dll.so %{_libdir}/wine/mprapi.dll.so +%{_libdir}/wine/mciqtz32.dll.so %{_libdir}/wine/msacm32.dll.so %{_libdir}/wine/msacm32.drv.so %{_libdir}/wine/msadp32.acm.so %{_libdir}/wine/mscat32.dll.so %{_libdir}/wine/mscoree.dll.so %{_libdir}/wine/msctf.dll.so +%{_libdir}/wine/msdaps.dll.so %{_libdir}/wine/msdmo.dll.so %{_libdir}/wine/msftedit.dll.so %{_libdir}/wine/msg711.acm.so +%{_libdir}/wine/msgsm32.acm.so %{_libdir}/wine/mshtml.dll.so %{_libdir}/wine/mshtml.tlb.so %{_libdir}/wine/msi.dll.so @@ -675,7 +759,6 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so %{_libdir}/wine/setupapi.dll.so -%{_libdir}/wine/setupx.dll16 %{_libdir}/wine/sfc_os.dll.so %{_libdir}/wine/shdoclc.dll.so %{_libdir}/wine/shdocvw.dll.so @@ -693,45 +776,31 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/svchost.exe.so %{_libdir}/wine/svrapi.dll.so %{_libdir}/wine/sxs.dll.so -%{_libdir}/wine/system.drv16 %{_libdir}/wine/t2embed.dll.so %{_libdir}/wine/tapi32.dll.so -%{_libdir}/wine/toolhelp.dll16 %{_libdir}/wine/traffic.dll.so %{_libdir}/wine/unicows.dll.so %{_libdir}/wine/unlodctr.exe.so %{_libdir}/wine/updspapi.dll.so %{_libdir}/wine/url.dll.so %{_libdir}/wine/urlmon.dll.so -%{_libdir}/wine/user.exe16 %{_libdir}/wine/user32.dll.so %{_libdir}/wine/usp10.dll.so %{_libdir}/wine/uxtheme.dll.so %{_libdir}/wine/userenv.dll.so -%{_libdir}/wine/vdhcp.vxd.so %{_libdir}/wine/vdmdbg.dll.so -%{_libdir}/wine/ver.dll16 %{_libdir}/wine/version.dll.so -%{_libdir}/wine/vmm.vxd.so -%{_libdir}/wine/vnbt.vxd.so -%{_libdir}/wine/vnetbios.vxd.so -%{_libdir}/wine/vtdapi.vxd.so -%{_libdir}/wine/vwin32.vxd.so -%{_libdir}/wine/w32skrnl.dll.so %{_libdir}/wine/wbemprox.dll.so %{_libdir}/wine/windowscodecs.dll.so %{_libdir}/wine/wineaudioio.drv.so -%{_libdir}/wine/winedos.dll.so %{_libdir}/wine/winecoreaudio.drv.so %{_libdir}/wine/winejoystick.drv.so %{_libdir}/wine/winex11.drv.so -%{_libdir}/wine/wing.dll16 %{_libdir}/wine/wing32.dll.so %{_libdir}/wine/winhttp.dll.so %{_libdir}/wine/wininet.dll.so %{_libdir}/wine/winmm.dll.so %{_libdir}/wine/winnls32.dll.so -%{_libdir}/wine/winsock.dll16 %{_libdir}/wine/winspool.drv.so %{_libdir}/wine/wmi.dll.so %{_libdir}/wine/wmiutils.dll.so @@ -741,16 +810,13 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/wintrust.dll.so %{_libdir}/wine/wnaspi32.dll.so %{_libdir}/wine/wow32.dll.so -%{_libdir}/wine/wprocs.dll16 %{_libdir}/wine/ws2_32.dll.so %{_libdir}/wine/wsock32.dll.so %{_libdir}/wine/wtsapi32.dll.so %{_libdir}/wine/wuapi.dll.so %{_libdir}/wine/security.dll.so %{_libdir}/wine/sfc.dll.so -%{_datadir}/wine/fonts/ %{_libdir}/wine/wineps.drv.so -%{_libdir}/wine/wineps16.drv16 %{_libdir}/wine/d3d8.dll.so %{_libdir}/wine/d3d9.dll.so %{_libdir}/wine/opengl32.dll.so @@ -763,8 +829,33 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/xinput1_3.dll.so %{_libdir}/wine/xinput9_1_0.dll.so %{_libdir}/wine/xmllite.dll.so -%{_sysconfdir}/ld.so.conf.d/wine-32.conf -# 16bit +%ifnarch x86_64 +# 16 bit and other non 64bit stuff +%{_libdir}/wine/winedos.dll.so +%{_libdir}/wine/winevdm.exe.so +%{_libdir}/wine/ifsmgr.vxd.so +%{_libdir}/wine/mmdevldr.vxd.so +%{_libdir}/wine/mmsystem.dll16 +%{_libdir}/wine/monodebg.vxd.so +%{_libdir}/wine/vdhcp.vxd.so +%{_libdir}/wine/ver.dll16 +%{_libdir}/wine/user.exe16 +%{_libdir}/wine/vmm.vxd.so +%{_libdir}/wine/wing.dll16 +%{_libdir}/wine/vnbt.vxd.so +%{_libdir}/wine/vnetbios.vxd.so +%{_libdir}/wine/vtdapi.vxd.so +%{_libdir}/wine/vwin32.vxd.so +%{_libdir}/wine/w32skrnl.dll.so +%{_libdir}/wine/commdlg.dll16 +%{_libdir}/wine/gdi.exe16 +%{_libdir}/wine/setupx.dll16 +%{_libdir}/wine/system.drv16 +%{_libdir}/wine/toolhelp.dll16 +%{_libdir}/wine/winsock.dll16 +%{_libdir}/wine/wprocs.dll16 +%{_libdir}/wine/wineps16.drv16 + %{_libdir}/wine/avifile.dll16.so %{_libdir}/wine/comm.drv16.so %{_libdir}/wine/compobj.dll16.so @@ -774,9 +865,9 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/dispdib.dll16.so %{_libdir}/wine/display.drv16.so %{_libdir}/wine/imm.dll16.so +%{_libdir}/wine/krnl386.exe16 %{_libdir}/wine/keyboard.drv16.so %{_libdir}/wine/lzexpand.dll16.so -%{_libdir}/wine/mciqtz32.dll.so %{_libdir}/wine/mouse.drv16.so %{_libdir}/wine/msacm.dll16.so %{_libdir}/wine/msvideo.dll16.so @@ -804,29 +895,36 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/winnls.dll16.so %{_libdir}/wine/winoldap.mod16.so %{_libdir}/wine/wintab.dll16.so +%endif -%files tools +%files common %defattr(-,root,root,-) +%{_bindir}/wineprefixcreate %{_bindir}/notepad %{_bindir}/winedbg -%{_bindir}/winedump %{_bindir}/winefile -%{_bindir}/winemaker %{_bindir}/winemine +%{_bindir}/winemaker %{_bindir}/winepath -%{_libdir}/wine/explorer.exe.so -%{_libdir}/wine/control.exe.so -%{_libdir}/wine/cmd.exe.so -%{_libdir}/wine/notepad.exe.so -%{_libdir}/wine/progman.exe.so -%{_libdir}/wine/taskmgr.exe.so -%{_libdir}/wine/winedbg.exe.so -%{_libdir}/wine/winefile.exe.so -%{_libdir}/wine/winemine.exe.so -%{_libdir}/wine/winepath.exe.so -%{_libdir}/wine/winver.exe.so -%{_libdir}/wine/wordpad.exe.so -%{_libdir}/wine/write.exe.so +%{_bindir}/msiexec +%{_bindir}/regedit +%{_bindir}/regsvr32 +%{_bindir}/wine +%{_bindir}/wineboot +%{_bindir}/wineconsole +%{_bindir}/winecfg +%dir %{_datadir}/wine +%{_mandir}/man1/wine.1.gz +%{_mandir}/man1/wineserver.1* +%{_mandir}/man1/wineprefixcreate.1* +%lang(fr) %{_mandir}/fr.UTF-8/man1/* +%{_datadir}/wine/generic.ppd +%{_datadir}/wine/wine.inf + +%files fonts +%defattr(-,root,root,-) +%{_datadir}/wine/fonts + %files desktop %defattr(-,root,root,-) @@ -846,31 +944,38 @@ update-desktop-database &>/dev/null || : %{_sysconfdir}/xdg/menus/applications-merged/wine.menu %{_initrddir}/wine +# esd subpackage %files esd %defattr(-,root,root,-) %{_libdir}/wine/wineesd.drv.so +# jack subpackage %files jack %defattr(-,root,root,-) %{_libdir}/wine/winejack.drv.so +# nas subpackage %files nas %defattr(-,root,root,-) %{_libdir}/wine/winenas.drv.so +# ldap subpackage %files ldap %defattr(-,root,root,-) %{_libdir}/wine/wldap32.dll.so +# cms subpackage %files cms %defattr(-,root,root,-) %{_libdir}/wine/mscms.dll.so +# twain subpackage %files twain %defattr(-,root,root,-) %{_libdir}/wine/twain_32.dll.so %{_libdir}/wine/sane.ds.so +# capi subpackage %files capi %defattr(-,root,root,-) %{_libdir}/wine/capi2032.dll.so @@ -887,7 +992,6 @@ update-desktop-database &>/dev/null || : %{_bindir}/winemaker %{_bindir}/wmc %{_bindir}/wrc -%{_libdir}/*.so %{_mandir}/man1/widl.1* %{_mandir}/man1/winebuild.1* %{_mandir}/man1/winedump.1* @@ -898,9 +1002,9 @@ update-desktop-database &>/dev/null || : %{_mandir}/man1/winedbg.1* %{_mandir}/man1/wineg++.1* %lang(de) %{_mandir}/de.UTF-8/man1/wine.1* -%{_datadir}/aclocal/wine.m4 %attr(0755, root, root) %dir %{_includedir}/wine %{_includedir}/wine/* +%{_libdir}/*.so %{_libdir}/wine/*.a %{_libdir}/wine/*.def @@ -919,6 +1023,22 @@ update-desktop-database &>/dev/null || : %{_libdir}/wine/wineoss.drv.so %changelog +* Mon Aug 24 2009 Andreas Bierfert +- 1.1.28-1 +- version upgrade +- make 32bit and 64bit version parallel installable + +* Sun Aug 09 2009 Andreas Bierfert +- 1.1.27-1 +- version upgrade +- WinePulse 0.30 + +* Thu Aug 06 2009 Andreas Bierfert +- 1.1.26-2 +- build 32bit wine on x86_64 and prepare for 64bit parallel build (#487651) +- fix subpackage problems (#485410,#508766,#508944,#514967) +- fix nss dependencies on x86_64 (#508412) + * Sat Jul 18 2009 Andreas Bierfert - 1.1.26-1 - version upgrade diff --git a/winepulse-0.29-configure.ac.patch b/winepulse-0.30-configure.ac.patch similarity index 75% rename from winepulse-0.29-configure.ac.patch rename to winepulse-0.30-configure.ac.patch index d6c4897..e4d800c 100644 --- a/winepulse-0.29-configure.ac.patch +++ b/winepulse-0.30-configure.ac.patch @@ -1,8 +1,8 @@ diff --git a/configure.ac b/configure.ac -index 3b805fe..4c2b822 100644 +index 59b771c..385a7e4 100644 --- a/configure.ac +++ b/configure.ac -@@ -58,6 +58,7 @@ AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]), +@@ -60,6 +60,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]) @@ -10,32 +10,32 @@ index 3b805fe..4c2b822 100644 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]) -@@ -1253,6 +1254,24 @@ then +@@ -1257,6 +1258,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.15]) -+ if "$PKG_CONFIG" --atleast-version=0.9.15 libpulse; then -+ have_pulseaudio="yes" ++ AC_MSG_CHECKING([for pulseaudio >= 0.9.14]) ++ if "$PKG_CONFIG" --atleast-version=0.9.14 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 ++ 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" -@@ -1379,7 +1398,7 @@ dnl **** Check for libodbc **** +@@ -1391,7 +1410,7 @@ dnl **** Check for libodbc **** WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])]) dnl **** Check for any sound system **** @@ -44,7 +44,7 @@ index 3b805fe..4c2b822 100644 "$ac_cv_header_sys_soundcard_h" != "yes" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_soundcard_h" != "yes" -a \ -@@ -2415,6 +2434,7 @@ WINE_CONFIG_MAKEFILE([dlls/winemp3.acm/Makefile],[dlls/Makedll.rules],[dlls],[AL +@@ -2429,6 +2448,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]) diff --git a/winepulse-0.29.patch b/winepulse-0.30.patch similarity index 99% rename from winepulse-0.29.patch rename to winepulse-0.30.patch index b42e21e..0d8970b 100644 --- a/winepulse-0.29.patch +++ b/winepulse-0.30.patch @@ -1416,10 +1416,10 @@ index 0000000..7cbc781 +#endif /* HAVE_PULSEAUDIO */ diff --git a/dlls/winepulse.drv/waveout.c b/dlls/winepulse.drv/waveout.c new file mode 100644 -index 0000000..ee92535 +index 0000000..458a33d --- /dev/null +++ b/dlls/winepulse.drv/waveout.c -@@ -0,0 +1,1075 @@ +@@ -0,0 +1,1070 @@ +/* + * Wine Driver for PulseAudio - WaveOut Functionality + * http://pulseaudio.org/ @@ -1616,7 +1616,7 @@ index 0000000..ee92535 + */ +static void wodPlayer_CheckReleasing(WINE_WAVEINST *wwo) { + -+ if (wwo->buffer_attr.tlength == -1 && wwo->lpQueuePtr && !wwo->lpPlayPtr && wwo->state == WINE_WS_PLAYING) { ++ if (wwo->buffer_attr.tlength == -1 && wwo->lpQueuePtr && !wwo->lpPlayPtr && wwo->state != WINE_WS_STOPPED) { + const pa_buffer_attr *returned; + + /* Try and adjust the buffer attributes so that playback can start. @@ -1625,12 +1625,7 @@ index 0000000..ee92535 + + pa_threaded_mainloop_lock(PULSE_ml); + -+ if (wwo->timing_info->playing) { -+ pa_threaded_mainloop_unlock(PULSE_ml); -+ return; -+ } -+ -+ /* Calculate desired buffer length. write_index is the amount of data ++ /* Calculate desired buffer length. write_index is the amount of data + * written. If there is more than one buffer queued, subtract the + * length of one to allow there to be a free buffer for the app. */ + wwo->buffer_attr.tlength = wwo->timing_info->write_index;