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

sync spec with cooker

Browse source
This commit is contained in:
akdengi 2012-09-14 15:31:11 +04:00
parent 37bdd96385
commit a3ba10bf7f
8 changed files with 289 additions and 2917 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +0,0 @@
sources:
"wine-1.3.24.tar.bz2": cc0dfc2255d1bc19e1975e5e2f680740d9c2825a

31
wine-1.3.24-64bit-tools.patch
View file

@ -1,21 +1,38 @@
diff -Naur tools.orig/wineapploader.in tools/wineapploader.in
--- tools.orig/wineapploader.in 2012-08-17 22:12:53.000000000 +0400
+++ tools/wineapploader.in 2012-08-27 12:49:37.979664330 +0400
@@ -26,7 +26,7 @@
--- b/tools/wineapploader.in 2012-06-15 23:17:00.000000000 +0400
+++ a/tools/wineapploader.in 2012-09-14 13:10:17.235533949 +0400
@@ -21,12 +21,20 @@
# determine the app Winelib library name
appname=`basename "$0" .exe`.exe
+compbit=`uname -m`
# first try explicit WINELOADER
if [ -x "$WINELOADER" ]; then exec "$WINELOADER" "$appname" "$@"; fi
# then default bin directory
-if [ -x "@bindir@/wine" ]; then exec "@bindir@/wine" "$appname" "$@"; fi
+if [ -x "@bindir@/wine" ]; then exec "@bindir@/wine64" "$appname" "$@"; fi
+if [ -x "@bindir@/wine" ]; then
+ if [[ $compbit = "x86_64" ]]
+ then
+ exec "@bindir@/wine64" "$appname" "$@"
+ else
+ exec "@bindir@/wine" "$appname" "$@"
+ fi
+fi
# now try the directory containing $0
appdir=""
@@ -46,7 +46,7 @@
@@ -46,7 +54,12 @@
done
;;
esac
-if [ -x "$appdir/wine" ]; then exec "$appdir/wine" "$appname" "$@"; fi
+if [ -x "$appdir/wine64" ]; then exec "$appdir/wine64" "$appname" "$@"; fi
+if [ -x "$appdir/wine64" && $compbit = "x86_64" ]
+ then
+ exec "$appdir/wine64" "$appname" "$@"
+ else
+ exec "$appdir/wine" "$appname" "$@"
+fi
# finally look in PATH
exec wine "$appname" "$@"

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

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAk4XTokACgkQ9ebp7rlGHdfS6wCgwKAuSKL6PjD/ivi/t6xip3hu
tcMAoNWk1LkVQ34XEiWIeQZ9nV7Oqkli
=oaEB
-----END PGP SIGNATURE-----

0
wine.init Executable file → Normal file
View file

388
wine.spec
View file

@ -19,30 +19,23 @@
Name: wine
#(peroyvind): please do backports for new versions
Version: 1.3.24
%define pre 0
%define rel 6
%if %pre
Release: %mkrel 0.%pre.%rel
%define o_ver %version-%pre
%else
Release: %mkrel %rel
%define o_ver %version
%endif
Epoch: 2
Version: 1.5.12
%define rel 1
Release: %mkrel %{rel}
%define o_ver %{version}
Epoch: 1
Summary: WINE Is Not An Emulator - runs MS Windows programs
License: LGPLv2+
Group: Emulators
URL: http://www.winehq.com/
BuildRoot: %_tmppath/%{name}-%{version}-%{release}-buildroot
Source0: http://ibiblio.org/pub/linux/system/emulators/wine/%{name}-%{o_ver}.tar.bz2
Source1: http://ibiblio.org/pub/linux/system/emulators/wine/%{name}-%{o_ver}.tar.bz2.sign
Source0: http://mirrors.ibiblio.org/wine/source/1.5//%{name}-%{o_ver}.tar.bz2
Source1: http://mirrors.ibiblio.org/wine/source/1.5//%{name}-%{o_ver}.tar.bz2.sign
# RH stuff
Source2: wine.init
Source2: wine.init
Source10: wine.rpmlintrc
Patch0: wine-1.0-rc3-fix-conflicts-with-openssl.patch
Patch1: wine-1.1.7-chinese-font-substitutes.patch
Patch2: wine-1.3.24-64bit-tools.patch
# (Anssi 05/2008) Adds:
# a: => /media/floppy (/mnt/floppy on 2007.1 and older)
# d: => $HOME (at config_dir creation time, not refreshed if $HOME changes;
@ -52,85 +45,74 @@ Patch2: wine-1.3.24-64bit-tools.patch
# com4 => /dev/ttyUSB0 (replaces /dev/ttyS3)
# have to substitute @MDKVERSION@ in dlls/ntdll/server.c
Patch108: wine-mdkconf.patch
Patch200: wine-1.3.24-64bit-tools.patch
#(eandry) add a pulseaudio sound driver (from http://art.ified.ca/downloads/ )
# Rediff configure.ac patch manually until winepulse upstream fixes it
Patch400: winepulse-configure.ac-1.3.22.patch
Patch401: http://art.ified.ca/downloads/winepulse/winepulse-0.39.patch
Patch402: http://art.ified.ca/downloads/winepulse/winepulse-winecfg-1.3.11.patch
# (anssi) Wine needs GCC 4.4+ on x86_64 for MS ABI support. Note also that
# 64-bit wine cannot run 32-bit programs without wine32.
ExclusiveArch: %{ix86}
%if %mdkversion >= 201010
%if %{mdkversion} >= 201010
ExclusiveArch: x86_64
%endif
%ifarch x86_64
BuildRequires: gcc >= 4.4
%endif
BuildRequires: bison flex
BuildRequires: gpm-devel
BuildRequires: perl-devel
BuildRequires: ncurses-devel
BuildRequires: cups-devel
BuildRequires: sane-devel
BuildRequires: lcms-devel
BuildRequires: autoconf
BuildRequires: docbook-utils docbook-dtd-sgml
BuildRequires: docbook-utils docbook-dtd-sgml sgml-tools
BuildRequires: jackit-devel
BuildRequires: pulseaudio-devel
BuildRequires: libmpg123-devel
BuildRequires: openal-devel
BuildRequires: libalsa-devel
BuildRequires: gstreamer0.10-devel libgstreamer0.10-plugins-base-devel
BuildRequires: isdn4k-utils-devel
BuildRequires: glibc-static-devel
BuildRequires: chrpath
BuildRequires: ungif-devel xpm-devel
BuildRequires: tiff-devel
BuildRequires: librsvg
BuildRequires: imagemagick
BuildRequires: gphoto2-devel
BuildRequires: desktop-file-utils
BuildRequires: openldap-devel
BuildRequires: libxslt-devel
BuildRequires: dbus-devel
BuildRequires: hal-devel
BuildRequires: valgrind
BuildRequires: gsm-devel
BuildRequires: unixODBC-devel
BuildRequires: gnutls-devel
BuildRequires: gettext-devel
BuildRequires: mesaglu-devel
BuildRequires: libv4l-devel
BuildRequires: libxcursor-devel libxcomposite-devel
BuildRequires: libxinerama-devel libxrandr-devel
BuildRequires: libx11-devel libxrender-devel
BuildRequires: libxext-devel libsm-devel
BuildRequires: fontforge fontconfig-devel freetype2-devel
BuildRequires: bison flex gpm-devel perl-devel ncurses-devel sgml-tools
BuildRequires: libx11-devel libxrender-devel libxext-devel libsm-devel
BuildRequires: freetype2-devel autoconf docbook-utils docbook-dtd-sgml
BuildRequires: cups-devel jackit-devel imagemagick isdn4k-utils-devel xpm-devel
BuildRequires: sane-devel glibc-static-devel ungif-devel chrpath
BuildRequires: desktop-file-utils libalsa-devel openldap-devel lcms-devel
BuildRequires: libxslt-devel dbus-devel hal-devel
BuildRequires: valgrind librsvg pulseaudio-devel gettext-devel
BuildRequires: gsm-devel
BuildRequires: mesaglu-devel
BuildRequires: fontforge
BuildRequires: gphoto2-devel
BuildRequires: unixODBC-devel
BuildRequires: bison
BuildRequires: flex
BuildRequires: gpm-devel
BuildRequires: perl-devel
BuildRequires: ncurses-devel
BuildRequires: cups-devel
BuildRequires: sane-devel
BuildRequires: lcms-devel
BuildRequires: autoconf
BuildRequires: docbook-utils
BuildRequires: docbook-dtd-sgml
BuildRequires: docbook-utils
BuildRequires: docbook-dtd-sgml
BuildRequires: sgml-tools
BuildRequires: jackit-devel
BuildRequires: pulseaudio-devel
BuildRequires: libmpg123-devel
BuildRequires: openal-devel libxrandr-devel libxinerama-devel libxcomposite-devel
BuildRequires: libxcursor-devel fontconfig-devel
BuildRequires: gnutls-devel tiff-devel libv4l-devel
BuildRequires: gstreamer0.10-devel libgstreamer0.10-plugins-base-devel
%if %mdvver >= 201100
BuildRequires: openal-devel
BuildRequires: libalsa-devel
BuildRequires: gstreamer0.10-devel
BuildRequires: libgstreamer0.10-plugins-base-devel
BuildRequires: isdn4k-utils-devel
BuildRequires: glibc-static-devel
BuildRequires: chrpath
BuildRequires: ungif-devel
BuildRequires: xpm-devel
BuildRequires: tiff-devel
BuildRequires: librsvg
BuildRequires: imagemagick
BuildRequires: libgphoto-devel
BuildRequires: desktop-file-utils
BuildRequires: openldap-devel
BuildRequires: libxslt-devel
BuildRequires: dbus-devel
BuildRequires: valgrind
BuildRequires: gsm-devel
BuildRequires: unixODBC-devel
BuildRequires: gnutls-devel
BuildRequires: gettext-devel
BuildRequires: mesaglu-devel
BuildRequires: libv4l-devel
BuildRequires: libxcursor-devel
BuildRequires: libxcomposite-devel
BuildRequires: libxinerama-devel
BuildRequires: libxrandr-devel
BuildRequires: libx11-devel
BuildRequires: libxrender-devel
BuildRequires: libxext-devel
BuildRequires: libsm-devel
BuildRequires: fontforge
BuildRequires: fontconfig-devel
BuildRequires: freetype2-devel
%if "%{distepoch}" >= "2011.0"
BuildRequires: prelink
%endif
@ -142,32 +124,44 @@ API calls using their Unix or X11 equivalents. The library may also \
be used for porting Win32 code into native Unix executables.
%ifarch x86_64
%package -n %{wine}
%package -n %{wine}
Summary: WINE Is Not An Emulator - runs MS Windows programs
Group: Emulators
Suggests: wine32 = %{epoch}:%{version}-%{release}
Suggests: wine32 = %{EVRD}
Suggests: wine64-gecko
Suggests: libncursesw.so.5%{mark64}
Suggests: libncurses.so.5%{mark64}
%else
# on 32-bit we always want wine32 package
Requires: wine32 = %{epoch}:%{version}-%{release}
Requires: wine32 = %{EVRD}
%endif
Provides: %{wine}-utils = %{epoch}:%{version}-%{release} %{wine}-full = %{epoch}:%{version}-%{release}
Provides: %{lib_name}-capi = %{epoch}:%{version}-%{release} %{lib_name}-twain = %{epoch}:%{version}-%{release}
Provides: %{lib_name} = %{epoch}:%{version}-%{release}
Provides: wine-bin = %{epoch}:%{version}-%{release}
Obsoletes: %{wine}-utils %{wine}-full %{lib_name}-capi %{lib_name}-twain
Obsoletes: %{lib_name} <= %{epoch}:%{version}-%{release}
Provides: %{wine}-utils = %{EVRD}
Provides: %{wine}-full = %{EVRD}
Provides: %{lib_name}-capi = %{EVRD}
Provides: %{lib_name}-twain = %{EVRD}
Provides: %{lib_name} = %{EVRD}
Provides: wine-bin = %{EVRD}
Obsoletes: %{wine}-utils %{wine}-full
Obsoletes: %{lib_name}-capi
Obsoletes: %{lib_name}-twain
Obsoletes: %{lib_name} <= %{EVRD}
Requires: xmessage
Suggests: sane-frontends
# wine dlopen's these, so let's add the dependencies ourself
Requires: libfreetype.so.6%{mark64} libasound.so.2%{mark64}
Requires: libXrender.so.1%{mark64} libpng.so.3%{mark64}
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Requires(post): desktop-common-data
Requires(postun): desktop-common-data
Requires(preun): rpm-helper
Requires: libfreetype.so.6%{mark64}
Requires: libasound.so.2%{mark64}
Requires: libXrender.so.1%{mark64}
%if "%{distepoch}" >= "2012.0"
Requires: libpng15.so.15%{mark64}
%else
Requires: libpng12.so.0%{mark64}
%endif
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Requires(post): desktop-common-data
Requires(postun): desktop-common-data
Requires(preun): rpm-helper
Requires(post): rpm-helper
Conflicts: %{wine} < 1:0.9-3mdk
%ifarch %{ix86}
@ -187,8 +181,8 @@ This package contains the Win64 version of Wine. You need the wine32
package from the 32-bit repository to be able to run 32-bit applications.
%endif
%ifarch %ix86
%package -n wine32
%ifarch %{ix86}
%package -n wine32
Summary: 32-bit support for Wine
Group: Emulators
# This is not an EVR-specific requirement, as otherwise on x86_64 urpmi could
@ -201,6 +195,8 @@ Conflicts: wine64 < 1:1.2-0.rc7.1
# start proposing to download wine-gecko from sourceforge, while recommending
# to use distribution packages instead. Therefore suggest wine-gecko here:
Suggests: wine-gecko
Suggests: libncursesw.so.5
Suggests: libncurses.so.5
%description -n wine32
Wine is a program which allows running Microsoft Windows programs
@ -210,14 +206,13 @@ This package contains the files needed to support 32-bit Windows
programs.
%endif
%package -n %{wine}-devel
%package -n %{wine}-devel
Summary: Static libraries and headers for %{name}
Group: Development/C
Requires: %{wine} = %{epoch}:%{version}
Provides: %{lib_name_devel} = %{epoch}:%{version}-%{release}
Provides: %{lib_name_orig}-devel = %{epoch}:%{version}-%{release}
Obsoletes: %{lib_name_devel} <= %{epoch}:%{version}-%{release}
Obsoletes: %{mklibname -d wine 1} < %{epoch}:%{version}
Requires: %{wine} = %{EVRD}
%rename %{lib_name_devel}
Provides: %{lib_name_orig}-devel = %{EVRD}
Obsoletes: %{mklibname -d wine 1} < %{EVRD}
%ifarch %{ix86}
Conflicts: wine64-devel
%else
@ -234,13 +229,10 @@ develop programs which make use of wine.
Wine is often updated.
%prep
%setup -q -n %name-%o_ver
%setup -q -n %{name}-%{o_ver}
%patch1 -p0 -b .chinese
%patch2 -p0 -b .tools64
%patch108 -p1 -b .conf
%patch400 -p1
%patch401 -p1
%patch402 -p1
%patch200 -p1
sed -i 's,@MDKVERSION@,%{mdkversion},' dlls/ntdll/server.c
%build
@ -261,7 +253,6 @@ autoreconf
%configure2_5x --with-x \
--with-pulse \
--without-nas \
--without-esd \
%ifarch x86_64
--enable-win64
%endif
@ -271,10 +262,10 @@ autoreconf
%install
rm -rf %{buildroot}
%makeinstall_std LDCONFIG=/bin/true
%makeinstall_std LDCONFIG=/bin/true
# Danny: dirty:
install -m755 tools/fnt2bdf -D %{buildroot}%{_bindir}/fnt2bdf
# install -m755 tools/fnt2bdf -D %{buildroot}%{_bindir}/fnt2bdf
# Allow users to launch Windows programs by just clicking on the .exe file...
install -m755 %{SOURCE2} -D %{buildroot}%{_initrddir}/%{name}
@ -392,9 +383,6 @@ you need to also install the 'wine32' package from the 32-bit repository.
EOF
%endif
%clean
rm -fr %{buildroot}
%preun -n %{wine}
%_preun_service %{name}
@ -402,7 +390,6 @@ rm -fr %{buildroot}
%_post_service %{name}
%files -n %{wine}
%defattr(-,root,root)
%doc ANNOUNCE AUTHORS README
%ifarch x86_64
%doc README.install.urpmi
@ -455,7 +442,6 @@ rm -fr %{buildroot}
%ifarch %{ix86}
%files -n wine32
%defattr(-,root,root)
%{_bindir}/wine
%{_bindir}/wine-preloader
%endif
@ -478,12 +464,11 @@ rm -fr %{buildroot}
%{_libdir}/%{name}/fakedlls
%files -n %{wine}-devel
%defattr(-,root,root)
%{_libdir}/%{name}/*.a
%{_libdir}/libwine*.so
%{_libdir}/%{name}/*.def
%{_includedir}/*
%{_bindir}/fnt2bdf
# %{_bindir}/fnt2bdf
%{_bindir}/wmc
%{_bindir}/wrc
%{_bindir}/winebuild
@ -505,8 +490,165 @@ rm -fr %{buildroot}
%{_mandir}/man1/winegcc.1*
%{_mandir}/pl.UTF-8/man1/wine.1*
%changelog
* Sat Jul 09 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.24-1mdv2011.0
* Sat Sep 01 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.5.12-1mdv2012.0
+ Revision: 816157
- Upgrade to 1.5.12
* Tue Aug 28 2012 Tomasz Pawel Gajc <tpg@mandriva.org> 1:1.5.11-1.2
+ Revision: 815962
- correct buildrequires on libgphoto-devel
- spec file clean
+ Zombie Ryushu <ryushu@mandriva.org>
- Why is the cluster rejecting this?
* Tue Aug 21 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.5.11-1
+ Revision: 815544
- Upgrade to 1.5.11
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
- add suggests on libncurses & libncursesw
* Thu Aug 02 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.5.10-1
+ Revision: 811627
- Upgrade to 1.5.10
* Thu Jul 19 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.5.9-1
+ Revision: 810145
- Upgrade to 1.5.9
* Thu Jul 05 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.5.8-1
+ Revision: 808157
- Upgrade to 1.5.8
* Sat Jun 30 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:1.5.7-1
+ Revision: 807634
- new version
- update download url
* Sat Jun 09 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.5.6-1
+ Revision: 804099
- Upgrade to 1.5.6
* Tue May 29 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.5.5-1
+ Revision: 801175
- fnt2bdf
- Upgrade to 1.5.5
* Mon May 14 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.5.4-1
+ Revision: 798763
- Upgrade to 1.5.4
* Sat Apr 28 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.5.3-1
+ Revision: 794200
- Upgrade to 1.5.3
* Fri Apr 20 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.5.2-1
+ Revision: 792410
- remove oname
- Upgrade to 1.5.2
- setup stage directory
* Mon Apr 02 2012 Bernhard Rosenkraenzer <bero@bero.eu> 1:1.5.1-1
+ Revision: 788714
- Update to 1.5.1
* Thu Mar 08 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.4-1
+ Revision: 783218
- Remove Pre-Release flahs
- Upgrade to 1.4
- Upgrade to 1.4
* Sun Mar 04 2012 Bernhard Rosenkraenzer <bero@bero.eu> 1:1.4-0.rc6.1
+ Revision: 782089
- Update to rc6
+ Dmitry Mikhirev <dmikhirev@mandriva.org>
- use %%mark64 for requires
* Tue Feb 28 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.4-0.rc5.1
+ Revision: 781187
- Upgrade to rc5
* Mon Feb 20 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:1.4-0.rc4.2
+ Revision: 778115
- use canonical soname dependency on libpng
* Fri Feb 17 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.4-0.rc4.1
+ Revision: 776309
- Upgrade to rc4
* Thu Feb 16 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.4-0.rc3.1
+ Revision: 775112
- Upgrade to rc3
* Sat Feb 04 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.4-0.rc2.1
+ Revision: 771074
- Upgrade to rc2
* Tue Jan 31 2012 Bernhard Rosenkraenzer <bero@bero.eu> 1:1.4-0.rc1.1
+ Revision: 770033
- Require the correct version of libpng (1.5, not 1.2)
- Update to 1.4-rc1
- Fix build with current rpmlint rules
* Sat Jan 14 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.37-1
+ Revision: 760871
- Upgrade to 1.3.37
* Sun Jan 01 2012 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.36-1
+ Revision: 748543
- Upgrade to 1.3.36
- Upgrade to 1.3.36
* Sat Dec 17 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.35-1
+ Revision: 743210
- Upgrade to 1.3.35
* Fri Dec 09 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.34-1
+ Revision: 739290
- Upgrade to 1.3.34
* Sat Nov 19 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.33-1
+ Revision: 731770
- Upgrade to 1.3.33
* Sat Nov 05 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.32-1
+ Revision: 719043
- Upgrade to 1.3.32
* Sat Oct 22 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.31-1
+ Revision: 705643
- Upgrade to 1.3.31
* Tue Oct 11 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.30-1
+ Revision: 704325
- Upgrade to 1.1.30
- upgrade to 1.3.29
* Sat Sep 10 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 1:1.3.28-1
+ Revision: 699297
- new version
- haul out some trash
- use %%{EVRD} & %%rename macros
* Tue Sep 06 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.27-1
+ Revision: 698389
- Fix missing backslash
- Upgrade to 1.3.27 and deprecated un-needed Winepulse patches
* Sat Aug 06 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.26-1
+ Revision: 693381
- Upgrade to 1.3.26
* Thu Aug 04 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.25-1
+ Revision: 693162
- Deprecate Winepulse
- Upgrade to 1.3.25
* Sat Jul 09 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.24-1
+ Revision: 689372
- Upgrade to 1.3.24
@ -1124,7 +1266,7 @@ rm -fr %{buildroot}
- New version 0.9.53
- restore buildroot
+ Olivier Blin <oblin@mandriva.com>
+ Olivier Blin <blino@mandriva.org>
- restore BuildRoot
* Sat Dec 29 2007 Funda Wang <fwang@mandriva.org> 1:0.9.52-1mdv2008.1
@ -1241,7 +1383,7 @@ rm -fr %{buildroot}
* Sun Jan 28 2007 Per Øyvind Karlsen <pkarlsen@mandriva.com> 0.9.30-1mdv2007.1
+ 2007-01-28 13:16:56 (114488)
- new release: 0.9.32
- new release: 0.9.30
drop P112 (fixed upstream)
* Thu Jan 11 2007 Anssi Hannula <anssi@mandriva.org> 0.9.29-1mdv2007.1

2669
winepulse-0.39.patch
View file

File diff suppressed because it is too large Load diff

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

@ -1,60 +0,0 @@
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
View file

@ -1,49 +0,0 @@
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"