Djam/wine2
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/wine2.git synced 2025-02-24 09:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

LOG -new stable version 1.4.1

Browse source
This commit is contained in:
akdengi 2012-09-14 09:16:13 +04:00
parent c977459067
commit 396df88e27
7 changed files with 2795 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
"wine-1.4.tar.bz2": ce5d56b9b949c01dde663ab39739ffcfb41a73c4
"wine-1.4.1.tar.bz2": cb79601ca92e8ecb8a5b6b64edc45fd366c3e579

7
wine-1.4.1.tar.bz2.sign Normal file
View file

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEYEABECAAYFAk/bimYACgkQ9ebp7rlGHddhBQCfajZ9aLIDeGQcgydcZ1/SIJ/X
9vEAn0Dw/92kpxmuxZ4wJxLSXMmhGGo6
=TltJ
-----END PGP SIGNATURE-----

7
wine-1.4.tar.bz2.sign
View file

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAk9XiPQACgkQ9ebp7rlGHdeHsgCgwixBJ4JWPGY/BjsxVCPReA9a
rDkAmgNuz7kfXsDmSXO/zg98hrCZ500v
=eoYv
-----END PGP SIGNATURE-----

12
wine.spec
View file

@ -19,9 +19,8 @@
Name: wine
#(peroyvind): please do backports for new versions
Version: 1.4
%define rel 1
Release: %mkrel %{rel}
Version: 1.4.1
Release: 1
%define o_ver %{version}
Epoch: 1
Summary: WINE Is Not An Emulator - runs MS Windows programs
@ -48,6 +47,9 @@ Patch2: wine-1.3.24-64bit-tools.patch
Patch108: wine-mdkconf.patch
#(eandry) add a pulseaudio sound driver (from http://art.ified.ca/downloads/ )
Patch200: winepulse-0.39.patch
Patch201: winepulse-configure.ac-1.3.22.patch
Patch202: winepulse-winecfg-1.3.11.patch
# Rediff configure.ac patch manually until winepulse upstream fixes it
@ -230,6 +232,10 @@ Wine is often updated.
%patch1 -p0 -b .chinese
%patch2 -p0 -b .tools64
%patch108 -p1 -b .conf
%patch200 -p1
%patch201 -p1
%patch202 -p1
sed -i 's,@MDKVERSION@,%{mdkversion},' dlls/ntdll/server.c
%build

2669
winepulse-0.39.patch Normal file
View file

File diff suppressed because it is too large Load diff

60
winepulse-configure.ac-1.3.22.patch Normal file
View file

@ -0,0 +1,60 @@
diff --git a/configure.ac b/configure.ac
index 2e20f24..fe07d5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,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(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF]),
[if test "x$withval" = "xno"; then ac_cv_header_tiffio_h=no; fi])
@@ -1479,6 +1480,30 @@ then
CFLAGS="$save_CFLAGS"
fi
+dnl **** Check for PulseAudio ****
+AC_SUBST(PULSELIBS,"")
+AC_SUBST(PULSEINCL,"")
+if test "x$with_pulse" != "xno";
+then
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ if test "$PKG_CONFIG" != "false";
+ then
+ ac_pulse_libs="`$PKG_CONFIG --libs libpulse 2>/dev/null`"
+ ac_pulse_cflags="`$PKG_CONFIG --cflags-only-I libpulse 2>/dev/null`"
+
+ CPPFLAGS="$CPPFLAGS $ac_pulse_cflags"
+ AC_CHECK_HEADERS(pulse/pulseaudio.h,
+ [AC_CHECK_LIB(pulse, pa_stream_is_corked,
+ [AC_DEFINE(HAVE_PULSEAUDIO, 1, [Define if you have pulseaudio])
+ PULSELIBS="$ac_pulse_libs"
+ PULSEINCL="$ac_pulse_cflags"],,$ac_pulse_libs)
+ ])
+ fi
+ CPPFLAGS="$ac_save_CPPFLAGS"
+fi
+WINE_WARNING_WITH(pulse, [test "$ac_cv_lib_pulse_pa_stream_is_corked" != "yes"],
+ [libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.])
+
dnl **** Check for gstreamer ****
if test "x$with_gstreamer" != "xno"
then
@@ -1693,7 +1718,7 @@ test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=$
test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
dnl **** Check for any sound system ****
-if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
+if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$PULSELIBS$ac_cv_lib_soname_jack" = "x" -a \
"x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \
"x$with_alsa$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnononononono
then
@@ -2883,6 +2908,7 @@ WINE_CONFIG_DLL(winenas.drv)
WINE_CONFIG_DLL(wineoss.drv)
WINE_CONFIG_DLL(wineps.drv,,[install-lib])
WINE_CONFIG_DLL(wineps16.drv16,enable_win16)
+WINE_CONFIG_DLL(winepulse.drv)
WINE_CONFIG_DLL(wineqtdecoder)
WINE_CONFIG_DLL(winequartz.drv)
WINE_CONFIG_DLL(winex11.drv)

49
winepulse-winecfg-1.3.11.patch Normal file
View file

@ -0,0 +1,49 @@
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index 4c90282..fcf3236 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -90,6 +90,7 @@ typedef struct
} AUDIO_DRIVER;
static 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 e402b4e..f0264ca 100644
--- a/programs/winecfg/libraries.c
+++ b/programs/winecfg/libraries.c
@@ -73,6 +73,7 @@ static const char * const builtin_only[] =
"winedos",
"winemp3.acm",
"wineps",
+ "winepulse.drv",
"winmm",
"wintab32",
"wnaspi32",
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index 3bed6aa..2f347d9 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -186,7 +186,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
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index f98a14d..314bd65 100644
--- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc
@@ -97,6 +97,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"