rpms/wine/F-11 adding-pulseaudio-to-winecfg-0.4.patch, NONE, 1.1 pulseaudio-winecfg-update.patch, NONE, 1.1 wine-64.conf, NONE, 1.1 wine-chooser.sh, NONE, 1.1 winepulse-0.30-configure.ac.patch, NONE, 1.1 winepulse-0.30.patch, NONE, 1.1 .cvsignore, 1.77, 1.78 sources, 1.78, 1.79 wine-rpath.patch, 1.7, 1.8 wine.spec, 1.109, 1.110 adding-pulseaudio-to-winecfg-0.3.patch, 1.1, NONE wine-desktop-mime.patch, 1.3, NONE winepulse-0.29-configure.ac.patch, 1.1, NONE winepulse-0.29.patch, 1.1, NONE
Andreas Bierfert
awjb at fedoraproject.org
Mon Aug 31 15:37:06 UTC 2009
- Previous message (by thread): rpms/maven-shared/devel maven-shared-8-jpp-depmap.xml, NONE, 1.1 maven-shared-ant-pom.patch, NONE, 1.1 maven-shared-disable-cobertura.patch, NONE, 1.1 maven-shared-file-management-pom.patch, NONE, 1.1 maven-shared-io-ArtifactLocatorStrategyTest.patch, NONE, 1.1 maven-shared-plugin-tools-pom.patch, NONE, 1.1 maven-shared-pom.patch, NONE, 1.1 maven-shared.spec, 1.10, 1.11 maven-shared-plugin-testing-harness-pom.patch, 1.1, NONE
- Next message (by thread): rpms/xforms/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xforms.spec, 1.27, 1.28 xforms-1.0.91-no_undefined.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/pkgs/rpms/wine/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11498
Modified Files:
.cvsignore sources wine-rpath.patch wine.spec
Added Files:
adding-pulseaudio-to-winecfg-0.4.patch
pulseaudio-winecfg-update.patch wine-64.conf wine-chooser.sh
winepulse-0.30-configure.ac.patch winepulse-0.30.patch
Removed Files:
adding-pulseaudio-to-winecfg-0.3.patch wine-desktop-mime.patch
winepulse-0.29-configure.ac.patch winepulse-0.29.patch
Log Message:
- version upgrade
- bug fixes
- 32 and 64 bit versions
adding-pulseaudio-to-winecfg-0.4.patch:
Bg.rc | 1 +
Cs.rc | 1 +
Da.rc | 1 +
De.rc | 1 +
En.rc | 1 +
Es.rc | 1 +
Fi.rc | 1 +
Fr.rc | 1 +
Hu.rc | 1 +
Ko.rc | 1 +
Nl.rc | 1 +
No.rc | 1 +
Pl.rc | 1 +
Pt.rc | 1 +
Ro.rc | 1 +
Ru.rc | 1 +
Si.rc | 1 +
Sv.rc | 1 +
Tr.rc | 1 +
Zh.rc | 1 +
audio.c | 1 +
libraries.c | 1 +
resource.h | 2 +-
23 files changed, 23 insertions(+), 1 deletion(-)
--- NEW FILE adding-pulseaudio-to-winecfg-0.4.patch ---
diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc
index fcdf895..e17690e 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_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
--- 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_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
--- 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_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
--- a/programs/winecfg/De.rc
+++ b/programs/winecfg/De.rc
@@ -272,6 +272,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 049aaa7..cef7c4a 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -272,6 +272,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 1771b4e..c49f9a3 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_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
--- 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_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
--- a/programs/winecfg/Fr.rc
+++ b/programs/winecfg/Fr.rc
@@ -274,6 +274,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 dc887fe..3ba696f 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_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 6f13e0c..d5403da 100644
--- a/programs/winecfg/Ko.rc
+++ b/programs/winecfg/Ko.rc
@@ -274,6 +274,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 4cd45f0..d23f359 100644
--- a/programs/winecfg/Nl.rc
+++ b/programs/winecfg/Nl.rc
@@ -273,6 +273,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 cc34fad..71876ba 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_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
--- 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_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 683dc68..be92466 100644
--- a/programs/winecfg/Pt.rc
+++ b/programs/winecfg/Pt.rc
@@ -470,6 +470,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 f12949f..2101ea1 100644
--- a/programs/winecfg/Ro.rc
+++ b/programs/winecfg/Ro.rc
@@ -272,6 +272,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "De bază"
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 7293cbc..fb57527 100644
--- a/programs/winecfg/Ru.rc
+++ b/programs/winecfg/Ru.rc
@@ -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 feaef36..c26e5cb 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_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
--- 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_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
--- 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_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
--- a/programs/winecfg/Zh.rc
+++ b/programs/winecfg/Zh.rc
@@ -273,6 +273,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 9f8a0a2..0ecb6c3 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_ALSA, "alsa"},
{IDS_DRIVER_OSS, "oss"},
{IDS_DRIVER_COREAUDIO, "coreaudio"},
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c
index 37cc12b..7c13fad 100644
--- a/programs/winecfg/libraries.c
+++ b/programs/winecfg/libraries.c
@@ -81,6 +81,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 27736b7..f8ba2ee 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -185,7 +185,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
pulseaudio-winecfg-update.patch:
Ja.rc | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE pulseaudio-winecfg-update.patch ---
--- 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 ドライãƒ"
--- NEW FILE wine-64.conf ---
/usr/lib64/wine/
--- NEW FILE wine-chooser.sh ---
#!/bin/sh
HAVE_32=false
HAVE_64=false
if [ -x "/usr/bin/wine32" ]; then
HAVE_32=true
fi
if [ -x "/usr/bin/wine64" ]; then
HAVE_64=true
fi
if [ -f "${1}" ]; then
archtype=`file "${1}" | cut -d':' -f2 | cut -d' ' -f2`
if [ ${archtype} = 'PE32+' ]; then # 64bit
if $HAVE_64; then
exec "/usr/bin/wine64" "${@}";
elif [ `uname -m` = 'x86_64' ]; then
echo "Your are trying to run a 64bit application. Please install the 64bit version of wine."
echo "You can achieve this by running 'su -c \"yum install \\\"wine(x86-64)\\\"\"'"
else
echo "Your are trying to run a 64bit application on a 32bit installation of Fedora. You need a 64bit version of Fedora to run this application."
fi
else
if $HAVE_32; then
exec "/usr/bin/wine32" "${@}"
else
echo "Your are trying to run a 32bit application. Please install the 32bit version of wine."
echo "You can achieve this by running 'su -c \"yum install \\\"wine(x86-32)\\\"\"'"
fi
fi
else
if $HAVE_64; then
exec "/usr/bin/wine64" "${@}";
else
exec "/usr/bin/wine32" "${@}";
fi
fi
winepulse-0.30-configure.ac.patch:
configure.ac | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
--- NEW FILE winepulse-0.30-configure.ac.patch ---
diff --git a/configure.ac b/configure.ac
index 59b771c..385a7e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
+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])
@@ -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.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
+ 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"
@@ -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 ****
-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 \
@@ -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])
+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])
winepulse-0.30.patch:
Makefile.in | 15
pulse.c | 788 +++++++++++++++++++++++++++++++++++++++
wavein.c | 595 +++++++++++++++++++++++++++++
waveout.c | 1070 +++++++++++++++++++++++++++++++++++++++++++++++++++++
winepulse.drv.spec | 3
winepulse.h | 196 +++++++++
6 files changed, 2667 insertions(+)
--- NEW FILE winepulse-0.30.patch ---
diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
new file mode 100644
index 0000000..c99c1da
--- /dev/null
+++ b/dlls/winepulse.drv/Makefile.in
@@ -0,0 +1,15 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+MODULE = winepulse.drv
+IMPORTS = winmm user32 kernel32
+EXTRALIBS = @PULSELIBS@
+
+C_SRCS = waveout.c \
+ wavein.c \
+ pulse.c
+
+ at MAKE_DLL_RULES@
+
+ at DEPENDENCIES@ # everything below this line is overwritten by make depend
diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
new file mode 100644
index 0000000..3dcb086
--- /dev/null
+++ b/dlls/winepulse.drv/pulse.c
@@ -0,0 +1,788 @@
+/*
+ * Wine Driver for PulseAudio
+ * http://pulseaudio.org/
+ *
+ * Copyright 2009 Arthur Taylor <theycallhimart at gmail.com>
+ *
+ * Contains code from other wine sound drivers.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "mmddk.h"
+#include "ks.h"
+#include "ksguid.h"
+#include "ksmedia.h"
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#include <poll.h>
+
+#ifdef HAVE_PULSEAUDIO
+
+#include "wine/unicode.h"
+#include "wine/debug.h"
+#include "wine/library.h"
+
+#include <winepulse.h>
+#include <pulse/pulseaudio.h>
+WINE_DEFAULT_DEBUG_CHANNEL(wave);
+
+/* These strings used only for tracing */
+const char * PULSE_getCmdString(enum win_wm_message msg) {
+ static char unknown[32];
+#define MSG_TO_STR(x) case x: return #x
+ switch(msg) {
+ MSG_TO_STR(WINE_WM_PAUSING);
+ MSG_TO_STR(WINE_WM_RESTARTING);
+ MSG_TO_STR(WINE_WM_RESETTING);
+ MSG_TO_STR(WINE_WM_HEADER);
+ MSG_TO_STR(WINE_WM_BREAKLOOP);
+ MSG_TO_STR(WINE_WM_CLOSING);
+ MSG_TO_STR(WINE_WM_STARTING);
+ MSG_TO_STR(WINE_WM_STOPPING);
+ MSG_TO_STR(WINE_WM_XRUN);
+ MSG_TO_STR(WINE_WM_FEED);
+ }
+#undef MSG_TO_STR
+ sprintf(unknown, "UNKNOWN(0x%08x)", msg);
+ return unknown;
+}
+
+/*======================================================================*
+ * Ring Buffer Functions - copied from winealsa.drv *
+ *======================================================================*/
+
+/* unless someone makes a wineserver kernel module, Unix pipes are faster than win32 events */
+#define USE_PIPE_SYNC
+
+#ifdef USE_PIPE_SYNC
+#define INIT_OMR(omr) do { if (pipe(omr->msg_pipe) < 0) { omr->msg_pipe[0] = omr->msg_pipe[1] = -1; } } while (0)
+#define CLOSE_OMR(omr) do { close(omr->msg_pipe[0]); close(omr->msg_pipe[1]); } while (0)
+#define SIGNAL_OMR(omr) do { int x = 0; write((omr)->msg_pipe[1], &x, sizeof(x)); } while (0)
+#define CLEAR_OMR(omr) do { int x = 0; read((omr)->msg_pipe[0], &x, sizeof(x)); } while (0)
+#define RESET_OMR(omr) do { } while (0)
+#define WAIT_OMR(omr, sleep) \
+ do { struct pollfd pfd; pfd.fd = (omr)->msg_pipe[0]; \
+ pfd.events = POLLIN; poll(&pfd, 1, sleep); } while (0)
+#else
+#define INIT_OMR(omr) do { omr->msg_event = CreateEventW(NULL, FALSE, FALSE, NULL); } while (0)
+#define CLOSE_OMR(omr) do { CloseHandle(omr->msg_event); } while (0)
+#define SIGNAL_OMR(omr) do { SetEvent((omr)->msg_event); } while (0)
+#define CLEAR_OMR(omr) do { } while (0)
+#define RESET_OMR(omr) do { ResetEvent((omr)->msg_event); } while (0)
+#define WAIT_OMR(omr, sleep) \
+ do { WaitForSingleObject((omr)->msg_event, sleep); } while (0)
+#endif
+
+#define PULSE_RING_BUFFER_INCREMENT 64
+
+/******************************************************************
+ * PULSE_InitRingMessage
+ *
+ * Initialize the ring of messages for passing between driver's caller
+ * and playback/record thread
+ */
+int PULSE_InitRingMessage(PULSE_MSG_RING* omr)
+{
+ omr->msg_toget = 0;
+ omr->msg_tosave = 0;
+ INIT_OMR(omr);
+ omr->ring_buffer_size = PULSE_RING_BUFFER_INCREMENT;
+ omr->messages = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,omr->ring_buffer_size * sizeof(PULSE_MSG));
+
+ InitializeCriticalSection(&omr->msg_crst);
+ omr->msg_crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PULSE_MSG_RING.msg_crst");
+ return 0;
+}
+
+/******************************************************************
+ * PULSE_DestroyRingMessage
+ *
+ */
+int PULSE_DestroyRingMessage(PULSE_MSG_RING* omr)
+{
+ CLOSE_OMR(omr);
+ HeapFree(GetProcessHeap(),0,omr->messages);
+ omr->messages = NULL;
+ omr->ring_buffer_size = PULSE_RING_BUFFER_INCREMENT;
+ omr->msg_crst.DebugInfo->Spare[0] = 0;
+ DeleteCriticalSection(&omr->msg_crst);
+ return 0;
+}
+/******************************************************************
+ * PULSE_ResetRingMessage
+ *
+ */
+void PULSE_ResetRingMessage(PULSE_MSG_RING* omr)
+{
+ RESET_OMR(omr);
+}
+
+/******************************************************************
+ * PULSE_WaitRingMessage
+ *
+ */
+void PULSE_WaitRingMessage(PULSE_MSG_RING* omr, DWORD sleep)
+{
+ WAIT_OMR(omr, sleep);
+}
+
+/******************************************************************
+ * PULSE_AddRingMessage
+ *
+ * Inserts a new message into the ring (should be called from DriverProc derived routines)
+ */
+int PULSE_AddRingMessage(PULSE_MSG_RING* omr, enum win_wm_message msg, DWORD param, BOOL wait)
+{
+ HANDLE hEvent = INVALID_HANDLE_VALUE;
+
+ EnterCriticalSection(&omr->msg_crst);
+ if ((omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size)))
+ {
+ int old_ring_buffer_size = omr->ring_buffer_size;
+ omr->ring_buffer_size += PULSE_RING_BUFFER_INCREMENT;
+ omr->messages = HeapReAlloc(GetProcessHeap(),0,omr->messages, omr->ring_buffer_size * sizeof(PULSE_MSG));
+ /* Now we need to rearrange the ring buffer so that the new
+ buffers just allocated are in between omr->msg_tosave and
+ omr->msg_toget.
+ */
[...2304 lines suppressed...]
index 0000000..4a834cd
--- /dev/null
+++ b/dlls/winepulse.drv/winepulse.h
@@ -0,0 +1,196 @@
+/* Definitions for PulseAudio Wine Driver
+ *
+ * Copyright 2009 Arthur Taylor <theycallhimart at gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_CONFIG_H
+# error You must include config.h to use this header
+#endif
+
+#if defined(HAVE_PULSEAUDIO) && !defined(__WINEPULSE_H)
+#define __WINEPULSE_H
+
+#include "mmreg.h"
+#include "dsound.h"
+#include "dsdriver.h"
+
+#include "ks.h"
+#include "ksmedia.h"
+#include "ksguid.h"
+
+#include <pulse/pulseaudio.h>
+
+/* state diagram for waveOut writing:
+ *
+ * +---------+-------------+---------------+---------------------------------+
+ * | state | function | event | new state |
+ * +---------+-------------+---------------+---------------------------------+
+ * | | open() | | STOPPED |
+ * | PAUSED | write() | | PAUSED |
+ * | STOPPED | write() | <thrd create> | PLAYING |
+ * | PLAYING | write() | HEADER | PLAYING |
+ * | (other) | write() | <error> | |
+ * | (any) | pause() | PAUSING | PAUSED |
+ * | PAUSED | restart() | RESTARTING | PLAYING (if no thrd => STOPPED) |
+ * | (any) | reset() | RESETTING | STOPPED |
+ * | (any) | close() | CLOSING | CLOSED |
+ * +---------+-------------+---------------+---------------------------------+
+ */
+
+/* states of the playing device */
+#define WINE_WS_PLAYING 1
+#define WINE_WS_PAUSED 2
+#define WINE_WS_STOPPED 3
+#define WINE_WS_CLOSED 4
+#define WINE_WS_FAILED 5
+
+#define PULSE_ALL_FORMATS \
+ WAVE_FORMAT_1M08 | /* Mono 11025Hz 8-bit */\
+ WAVE_FORMAT_1M16 | /* Mono 11025Hz 16-bit */\
+ WAVE_FORMAT_1S08 | /* Stereo 11025Hz 8-bit */\
+ WAVE_FORMAT_1S16 | /* Stereo 11025Hz 16-bit */\
+ WAVE_FORMAT_2M08 | /* Mono 22050Hz 8-bit */\
+ WAVE_FORMAT_2M16 | /* Mono 22050Hz 16-bit */\
+ WAVE_FORMAT_2S08 | /* Stereo 22050Hz 8-bit */\
+ WAVE_FORMAT_2S16 | /* Stereo 22050Hz 16-bit */\
+ WAVE_FORMAT_4M08 | /* Mono 44100Hz 8-bit */\
+ WAVE_FORMAT_4M16 | /* Mono 44100Hz 16-bit */\
+ WAVE_FORMAT_4S08 | /* Stereo 44100Hz 8-bit */\
+ WAVE_FORMAT_4S16 | /* Stereo 44100Hz 16-bit */\
+ WAVE_FORMAT_48M08 | /* Mono 48000Hz 8-bit */\
+ WAVE_FORMAT_48S08 | /* Stereo 48000Hz 8-bit */\
+ WAVE_FORMAT_48M16 | /* Mono 48000Hz 16-bit */\
+ WAVE_FORMAT_48S16 | /* Stereo 48000Hz 16-bit */\
+ WAVE_FORMAT_96M08 | /* Mono 96000Hz 8-bit */\
+ WAVE_FORMAT_96S08 | /* Stereo 96000Hz 8-bit */\
+ WAVE_FORMAT_96M16 | /* Mono 96000Hz 16-bit */\
+ WAVE_FORMAT_96S16 /* Stereo 96000Hz 16-bit */
+
+/* events to be sent to device */
+enum win_wm_message {
+ WINE_WM_PAUSING = WM_USER + 1, WINE_WM_RESTARTING, WINE_WM_RESETTING, WINE_WM_HEADER,
+ WINE_WM_BREAKLOOP, WINE_WM_CLOSING, WINE_WM_STARTING, WINE_WM_STOPPING, WINE_WM_XRUN, WINE_WM_FEED
+};
+
+typedef struct {
+ enum win_wm_message msg; /* message identifier */
+ DWORD param; /* parameter for this message */
+ HANDLE hEvent; /* if message is synchronous, handle of event for synchro */
+} PULSE_MSG;
+
+/* implement an in-process message ring for better performance
+ * (compared to passing thru the server)
+ * this ring will be used by the input (resp output) record (resp playback) routine
+ */
+typedef struct {
+ PULSE_MSG * messages;
+ int ring_buffer_size;
+ int msg_tosave;
+ int msg_toget;
+/* Either pipe or event is used, but that is defined in pulse.c,
+ * since this is a global header we define both here */
+ int msg_pipe[2];
+ HANDLE msg_event;
+ CRITICAL_SECTION msg_crst;
+} PULSE_MSG_RING;
+
+typedef struct WINE_WAVEDEV WINE_WAVEDEV;
+typedef struct WINE_WAVEINST WINE_WAVEINST;
+
+/* Per-playback/record device */
+struct WINE_WAVEDEV {
+ char interface_name[MAXPNAMELEN * 2];
+ char *device_name;
+ pa_cvolume volume;
+
+ union {
+ WAVEOUTCAPSW out;
+ WAVEINCAPSW in;
+ } caps;
+
+ /* DirectSound stuff */
+ DSDRIVERDESC ds_desc;
+ DSDRIVERCAPS ds_caps;
+};
+
+/* Per-playback/record instance */
+struct WINE_WAVEINST {
+ volatile INT state; /* one of the WINE_WS_ manifest constants */
+ WAVEOPENDESC waveDesc;
+ WORD wFlags;
+
+ /* PulseAudio specific data */
+ pa_stream *stream; /* The PulseAudio stream */
+ const pa_timing_info *timing_info; /* The timing info structure for the stream */
+ pa_sample_spec sample_spec; /* Sample spec of this stream / device */
+ pa_cvolume volume; /* Software volume of the stream */
+ pa_buffer_attr buffer_attr; /* Buffer attribute, may not be used */
+
+ /* waveIn / waveOut wavaHdr */
+ LPWAVEHDR lpQueuePtr; /* Start of queued WAVEHDRs (waiting to be notified) */
+ LPWAVEHDR lpPlayPtr; /* Start of not yet fully written buffers */
+ DWORD dwPartialOffset; /* Offset of not yet written bytes in lpPlayPtr */
+ LPWAVEHDR lpLoopPtr; /* Pointer of first buffer in loop, if any */
+ DWORD dwLoops; /* Private copy of loop counter */
+ DWORD dwLastReset; /* When the last reset occured, as pa stream time doesn't reset */
+
+ /* waveIn specific */
+ const void *buffer; /* Pointer to the latest data fragment for recording streams */
+ DWORD buffer_length; /* How large the latest data fragment is */
+ DWORD buffer_read_offset; /* How far into latest data fragment we last read */
+
+ /* Thread communication and synchronization stuff */
+ HANDLE hStartUpEvent;
+ HANDLE hThread;
+ DWORD dwThreadID;
+ PULSE_MSG_RING msgRing;
+};
+
+/* We establish one context per instance, so make it global to the lib */
+pa_context *PULSE_context; /* Connection Context */
+pa_threaded_mainloop *PULSE_ml; /* PA Runtime information */
+
+/* WaveIn / WaveOut devices */
+WINE_WAVEDEV *WOutDev;
+WINE_WAVEDEV *WInDev;
+DWORD PULSE_WodNumDevs;
+DWORD PULSE_WidNumDevs;
+
+/* pulse.c: PulseAudio Async Callbacks */
+void PULSE_StreamSuccessCallback(pa_stream *s, int success, void *userdata);
+void PULSE_StreamStateCallback(pa_stream *s, void *userdata);
+void PULSE_StreamUnderflowCallback(pa_stream *s, void *userdata);
+void PULSE_StreamSuspendedCallback(pa_stream *s, void *userdata);
+void PULSE_StreamMovedCallback(pa_stream *s, void *userdata);
+void PULSE_ContextSuccessCallback(pa_context *c, int success, void *userdata);
+
+/* pulse.c: General Functions */
+void PULSE_WaitForOperation(pa_operation *o);
+BOOL PULSE_SetupFormat(LPWAVEFORMATEX wf, pa_sample_spec *ss);
+HRESULT PULSE_UsecToMMTime(pa_usec_t time, LPMMTIME lpTime, const pa_sample_spec *ss);
+
+/* pulse.c: Message Ring */
+int PULSE_InitRingMessage(PULSE_MSG_RING* omr);
+int PULSE_DestroyRingMessage(PULSE_MSG_RING* omr);
+void PULSE_ResetRingMessage(PULSE_MSG_RING* omr);
+void PULSE_WaitRingMessage(PULSE_MSG_RING* omr, DWORD sleep);
+int PULSE_AddRingMessage(PULSE_MSG_RING* omr, enum win_wm_message msg, DWORD param, BOOL wait);
+int PULSE_RetrieveRingMessage(PULSE_MSG_RING* omr, enum win_wm_message *msg, DWORD *param, HANDLE *hEvent);
+
+/* pulse.c: Tracing */
+const char * PULSE_getCmdString(enum win_wm_message msg);
+#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/.cvsignore,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- .cvsignore 19 Jul 2009 10:47:47 -0000 1.77
+++ .cvsignore 31 Aug 2009 15:37:06 -0000 1.78
@@ -1 +1 @@
-wine-1.1.26-fe.tar.bz2
+wine-1.1.28-fe.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources 19 Jul 2009 10:47:48 -0000 1.78
+++ sources 31 Aug 2009 15:37:06 -0000 1.79
@@ -1 +1 @@
-7b2affded452ced2b1f45a9b7e6f24da wine-1.1.26-fe.tar.bz2
+6342c41f46d0571efae685c17aa5550f wine-1.1.28-fe.tar.bz2
wine-rpath.patch:
configure | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
Index: wine-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/wine-rpath.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- wine-rpath.patch 23 Nov 2008 10:44:34 -0000 1.7
+++ wine-rpath.patch 31 Aug 2009 15:37:06 -0000 1.8
@@ -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
Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-11/wine.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- wine.spec 19 Jul 2009 10:47:48 -0000 1.109
+++ wine.spec 31 Aug 2009 15:37:06 -0000 1.110
@@ -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.ta
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.
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 <andreas.bierfert[AT]lowlatency.de>
+- 1.1.28-1
+- version upgrade
+- make 32bit and 64bit version parallel installable
+
+* Sun Aug 09 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.27-1
+- version upgrade
+- WinePulse 0.30
+
+* Thu Aug 06 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 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 <andreas.bierfert[AT]lowlatency.de>
- 1.1.26-1
- version upgrade
--- adding-pulseaudio-to-winecfg-0.3.patch DELETED ---
--- wine-desktop-mime.patch DELETED ---
--- winepulse-0.29-configure.ac.patch DELETED ---
--- winepulse-0.29.patch DELETED ---
- Previous message (by thread): rpms/maven-shared/devel maven-shared-8-jpp-depmap.xml, NONE, 1.1 maven-shared-ant-pom.patch, NONE, 1.1 maven-shared-disable-cobertura.patch, NONE, 1.1 maven-shared-file-management-pom.patch, NONE, 1.1 maven-shared-io-ArtifactLocatorStrategyTest.patch, NONE, 1.1 maven-shared-plugin-tools-pom.patch, NONE, 1.1 maven-shared-pom.patch, NONE, 1.1 maven-shared.spec, 1.10, 1.11 maven-shared-plugin-testing-harness-pom.patch, 1.1, NONE
- Next message (by thread): rpms/xforms/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xforms.spec, 1.27, 1.28 xforms-1.0.91-no_undefined.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list