mirror of
https://abf.rosa.ru/djam/wine.git
synced 2025-02-24 06:42:47 +00:00
revert to wine 1.3.x that 1.4 fully unworked
This commit is contained in:
akdengi
parent
672677dc58
commit
454bd949f4
8 changed files with 2942 additions and 203 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
"wine-1.4.tar.bz2": ce5d56b9b949c01dde663ab39739ffcfb41a73c4
|
||||
"wine-1.3.24.tar.bz2": cc0dfc2255d1bc19e1975e5e2f680740d9c2825a
|
||||
|
|
|
|||
7
wine-1.3.24.tar.bz2.sign
Normal file
7
wine-1.3.24.tar.bz2.sign
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||
|
||||
iEYEABECAAYFAk4XTokACgkQ9ebp7rlGHdfS6wCgwKAuSKL6PjD/ivi/t6xip3hu
|
||||
tcMAoNWk1LkVQ34XEiWIeQZ9nV7Oqkli
|
||||
=oaEB
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||
|
||||
iEYEABECAAYFAk9XiPQACgkQ9ebp7rlGHdeHsgCgwixBJ4JWPGY/BjsxVCPReA9a
|
||||
rDkAmgNuz7kfXsDmSXO/zg98hrCZ500v
|
||||
=eoYv
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
@ -9,10 +9,7 @@
|
|||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: wine
|
||||
# Required-Start:
|
||||
# Required-Stop:
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Allow users to run Windows(tm) applications
|
||||
# Description: Allow users to run Windows(tm) applications by just clicking
|
||||
# on them (or typing ./file.exe)
|
||||
|
|
|
|||
348
wine.spec
348
wine.spec
|
|
@ -17,14 +17,11 @@
|
|||
# wine64 - all 64-bit files (suggests 'wine32')
|
||||
# - Anssi 07/2010
|
||||
|
||||
# When altering this, make sure the new wine-gecko is submitted or at least
|
||||
# notify its maintainer of the needed update.
|
||||
%define gecko_version 1.4
|
||||
|
||||
Name: wine
|
||||
Version: 1.4
|
||||
#(peroyvind): please do backports for new versions
|
||||
Version: 1.3.24
|
||||
%define pre 0
|
||||
%define rel 3
|
||||
%define rel 1
|
||||
%if %pre
|
||||
Release: %mkrel 0.%pre.%rel
|
||||
%define o_ver %version-%pre
|
||||
|
|
@ -32,13 +29,14 @@ Release: %mkrel 0.%pre.%rel
|
|||
Release: %mkrel %rel
|
||||
%define o_ver %version
|
||||
%endif
|
||||
Epoch: 1
|
||||
Epoch: 2
|
||||
Summary: WINE Is Not An Emulator - runs MS Windows programs
|
||||
License: LGPLv2+
|
||||
Group: Emulators
|
||||
URL: http://www.winehq.com/
|
||||
Source0: http://prdownloads.sourceforge.net/wine/%{name}-%{o_ver}.tar.bz2
|
||||
Source1: http://prdownloads.sourceforge.net/wine/%{name}-%{o_ver}.tar.bz2.sign
|
||||
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
|
||||
|
||||
# RH stuff
|
||||
Source2: wine.init
|
||||
|
|
@ -48,55 +46,92 @@ Patch1: wine-1.1.7-chinese-font-substitutes.patch
|
|||
# a: => /media/floppy (/mnt/floppy on 2007.1 and older)
|
||||
# d: => $HOME (at config_dir creation time, not refreshed if $HOME changes;
|
||||
# note that Wine also provides $HOME in My Documents)
|
||||
# only on 2008.0: e: => /media/cdrom (does not exist on 2008.1+)
|
||||
# only on 2007.1 and older: e: => /mnt/cdrom
|
||||
# com4 => /dev/ttyUSB0 (replaces /dev/ttyS3)
|
||||
# have to substitute @MDKVERSION@ in dlls/ntdll/server.c
|
||||
Patch108: wine-mdkconf.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
|
||||
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: 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-devel
|
||||
|
||||
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: unixODBC-devel
|
||||
BuildRequires: gnutls-devel
|
||||
BuildRequires: prelink
|
||||
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: fontforge
|
||||
BuildRequires: gphoto2-devel
|
||||
BuildRequires: unixODBC-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: prelink
|
||||
%endif
|
||||
|
||||
%define desc Wine is a program which allows running Microsoft Windows programs \
|
||||
(including DOS, Windows 3.x and Win32 executables) on Unix. It \
|
||||
|
|
@ -110,7 +145,7 @@ be used for porting Win32 code into native Unix executables.
|
|||
Summary: WINE Is Not An Emulator - runs MS Windows programs
|
||||
Group: Emulators
|
||||
Suggests: wine32 = %{epoch}:%{version}-%{release}
|
||||
Suggests: wine64-gecko = %gecko_version
|
||||
Suggests: wine64-gecko
|
||||
%else
|
||||
# on 32-bit we always want wine32 package
|
||||
Requires: wine32 = %{epoch}:%{version}-%{release}
|
||||
|
|
@ -126,16 +161,14 @@ 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}
|
||||
# wine needs to dlopen libfontconfig to make CJK fonts show correctly in winecfg
|
||||
Requires: libfontconfig.so.1%{mark64}
|
||||
Requires: libncurses.so.5%{mark64}
|
||||
Requires: libXrender.so.1%{mark64} libpng15.so.15%{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(post): rpm-helper
|
||||
Conflicts: %{wine} < 1:0.9-3mdk
|
||||
%ifarch %{ix86}
|
||||
Conflicts: wine64
|
||||
%else
|
||||
|
|
@ -166,7 +199,7 @@ Conflicts: wine64 < 1:1.2-0.rc7.1
|
|||
# (Anssi) If wine-gecko is not installed, wine pops up a dialog on first
|
||||
# start proposing to download wine-gecko from sourceforge, while recommending
|
||||
# to use distribution packages instead. Therefore suggest wine-gecko here:
|
||||
Suggests: wine-gecko = %gecko_version
|
||||
Suggests: wine-gecko
|
||||
|
||||
%description -n wine32
|
||||
Wine is a program which allows running Microsoft Windows programs
|
||||
|
|
@ -203,11 +236,11 @@ Wine is often updated.
|
|||
%setup -q -n %name-%o_ver
|
||||
%patch1 -p0 -b .chinese
|
||||
%patch108 -p1 -b .conf
|
||||
%patch400 -p1
|
||||
%patch401 -p1
|
||||
%patch402 -p1
|
||||
sed -i 's,@MDKVERSION@,%{mdkversion},' dlls/ntdll/server.c
|
||||
|
||||
GECKO_VERSION=$(sed -rn 's,^#define\s+GECKO_VERSION\s+"([^"]*)".*$,\1,p' dlls/appwiz.cpl/addons.c)
|
||||
[ "$GECKO_VERSION" = "%gecko_version" ] || { echo wine-gecko version mismatch; exit 1; }
|
||||
|
||||
%build
|
||||
%ifarch %ix86
|
||||
# (Anssi 04/2008) bug #39604
|
||||
|
|
@ -226,6 +259,7 @@ autoreconf
|
|||
%configure2_5x --with-x \
|
||||
--with-pulse \
|
||||
--without-nas \
|
||||
--without-esd \
|
||||
%ifarch x86_64
|
||||
--enable-win64
|
||||
%endif
|
||||
|
|
@ -392,7 +426,6 @@ rm -fr %{buildroot}
|
|||
%lang(de) %{_mandir}/de.UTF-8/man1/winemaker.1*
|
||||
%lang(de) %{_mandir}/de.UTF-8/man1/wineserver.1*
|
||||
%lang(fr) %{_mandir}/fr.UTF-8/man1/*
|
||||
%lang(pl) %{_mandir}/pl.UTF-8/man1/wine.1*
|
||||
%{_mandir}/man1/wineserver.1*
|
||||
%{_mandir}/man1/msiexec.1*
|
||||
%{_mandir}/man1/notepad.1*
|
||||
|
|
@ -468,160 +501,91 @@ rm -fr %{buildroot}
|
|||
%{_mandir}/man1/winedbg.1*
|
||||
%{_mandir}/man1/wineg++.1*
|
||||
%{_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
|
||||
+ Revision: 689372
|
||||
- Upgrade to 1.3.24
|
||||
|
||||
* Fri Mar 09 2012 fwang <fwang> 1:1.4-1.mga2
|
||||
+ Revision: 221865
|
||||
- new version 1.4 final
|
||||
* Sat Jun 25 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.23-1
|
||||
+ Revision: 687173
|
||||
- Upgrade to 1.3.23
|
||||
|
||||
* Sun Feb 05 2012 zezinho <zezinho> 1:1.4-0.rc2.1.mga2
|
||||
+ Revision: 204994
|
||||
- new version 1.4 rc2
|
||||
* Sun Jun 12 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.22-2.2
|
||||
+ Revision: 684354
|
||||
- Update Build deps because some were missing
|
||||
- Fix man page
|
||||
|
||||
* Sat Dec 31 2011 supp <supp> 1:1.3.36-1.mga2
|
||||
+ Revision: 189304
|
||||
- bump to 1.3.36
|
||||
* Fri Jun 10 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.22-2
|
||||
+ Revision: 684188
|
||||
- Fix man page
|
||||
- Fix man page
|
||||
- Upgrade to 1.3.22
|
||||
|
||||
+ anssi <anssi>
|
||||
- versionize suggests on gecko and enforce correct version with a %%prep
|
||||
check
|
||||
* Sat May 28 2011 Funda Wang <fwang@mandriva.org> 1:1.3.21-1
|
||||
+ Revision: 680398
|
||||
- update to new version 1.3.21
|
||||
|
||||
* Sat Dec 17 2011 zezinho <zezinho> 1:1.3.35-1.mga2
|
||||
+ Revision: 183137
|
||||
- new version
|
||||
* Sat May 14 2011 Funda Wang <fwang@mandriva.org> 1:1.3.20-2
|
||||
+ Revision: 674586
|
||||
- rediff winepulse configure.ac patch
|
||||
|
||||
* Mon Dec 05 2011 zezinho <zezinho> 1:1.3.34-1.mga2
|
||||
+ Revision: 177101
|
||||
- new version
|
||||
+ Zombie Ryushu <ryushu@mandriva.org>
|
||||
- Upgrade 1.3.20
|
||||
|
||||
* Wed Oct 26 2011 dmorgan <dmorgan> 1:1.3.30-2.mga2
|
||||
+ Revision: 158136
|
||||
- Rebuild because of missing packages
|
||||
|
||||
* Thu Oct 20 2011 zezinho <zezinho> 1:1.3.30-1.mga2
|
||||
+ Revision: 156874
|
||||
- use realvendor macro
|
||||
- new version
|
||||
|
||||
* Mon Sep 26 2011 fwang <fwang> 1:1.3.29-2.mga2
|
||||
+ Revision: 147966
|
||||
- rebuild for missing packages
|
||||
|
||||
* Mon Sep 26 2011 fwang <fwang> 1:1.3.29-1.mga2
|
||||
+ Revision: 147954
|
||||
- new version 1.3.29
|
||||
|
||||
* Mon Sep 12 2011 fwang <fwang> 1:1.3.28-1.mga2
|
||||
+ Revision: 142563
|
||||
- new version 1.3.28
|
||||
|
||||
* Mon Sep 12 2011 dmorgan <dmorgan> 1:1.3.27-2.mga2
|
||||
+ Revision: 142533
|
||||
- Rebuild against new libpng
|
||||
|
||||
* Mon Sep 05 2011 fwang <fwang> 1:1.3.27-1.mga2
|
||||
+ Revision: 138551
|
||||
- fix init script
|
||||
- new version 1.3.27
|
||||
|
||||
+ ahmad <ahmad>
|
||||
- Drop the winepulse patches, they're useless now that wine upstream has
|
||||
rewritten the audio support, using the Win7 architecture [mmdevapi]
|
||||
(thanks to Arthur Taylor for the heads up)
|
||||
- Drop the, now, redundant BR jackit-devel, upstream dropped support for Jack
|
||||
- Update to 1.3.25
|
||||
- Rediff winepulse-winecfg and winepulse-configure.ac patches manually
|
||||
- Drop obsolete configure options
|
||||
|
||||
* Sat Jul 09 2011 ahmad <ahmad> 1:1.3.24-1.mga2
|
||||
+ Revision: 120937
|
||||
- Update to 1.3.24
|
||||
|
||||
* Sat Jun 25 2011 ahmad <ahmad> 1:1.3.23-1.mga2
|
||||
+ Revision: 113803
|
||||
- Update to 1.3.23
|
||||
- Update winepulse patches
|
||||
- Add BR valgrind-devel (needed after the valgrind package latest split)
|
||||
|
||||
* Fri Jun 10 2011 ahmad <ahmad> 1:1.3.22-1.mga2
|
||||
+ Revision: 103264
|
||||
- Update to 1.3.22
|
||||
- Switch the Source(s) URLs to sourceforge, seems faster than ibiblio
|
||||
- Update the file list
|
||||
|
||||
* Tue Jun 07 2011 ahmad <ahmad> 1:1.3.21-1.mga2
|
||||
+ Revision: 101529
|
||||
- Update to 1.3.21
|
||||
- Use winepulse-configure.ac-1.3.20 from upstream
|
||||
|
||||
* Fri May 13 2011 ahmad <ahmad> 1:1.3.20-2.mga1
|
||||
+ Revision: 98204
|
||||
- Update to 1.3.20
|
||||
|
||||
* Mon May 09 2011 anssi <anssi> 1:1.3.19-2.mga1
|
||||
+ Revision: 96590
|
||||
* Mon May 09 2011 Anssi Hannula <anssi@mandriva.org> 1:1.3.19-2
|
||||
+ Revision: 673040
|
||||
- add suggests on wine64-gecko in wine64
|
||||
- update old comment in .spec
|
||||
|
||||
* Fri Apr 29 2011 ahmad <ahmad> 1:1.3.19-1.mga1
|
||||
+ Revision: 93485
|
||||
- Update to 1.3.19
|
||||
- Rediff the winepulse-configure.ac patch
|
||||
* Sun May 01 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.19-1
|
||||
+ Revision: 661378
|
||||
- Fix Winepulse
|
||||
- Fix Winepulse
|
||||
- Upgrade to 1.3.19
|
||||
|
||||
* Fri Apr 15 2011 ahmad <ahmad> 1:1.3.18-1.mga1
|
||||
+ Revision: 85844
|
||||
- update to 1.3.18
|
||||
* Thu Apr 21 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.18-1
|
||||
+ Revision: 656561
|
||||
- Upgrade to wine 1.3.18
|
||||
|
||||
* Fri Apr 01 2011 ahmad <ahmad> 1:1.3.17-1.mga1
|
||||
+ Revision: 79692
|
||||
- update to 1.3.17
|
||||
* Sat Apr 09 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.17-2
|
||||
+ Revision: 652133
|
||||
- Fix missing build deps
|
||||
|
||||
* Sun Mar 20 2011 ahmad <ahmad> 1:1.3.16-5.mga1
|
||||
+ Revision: 74642
|
||||
- update to 3.1.16
|
||||
- rediff winepulse configure.ac patch manually until winepulse upstream catches
|
||||
up
|
||||
- add a requires on libncurses.so.*, winecfg (i586) complains about it in
|
||||
x86_64 installs
|
||||
* Sat Apr 09 2011 Funda Wang <fwang@mandriva.org> 1:1.3.17-1
|
||||
+ Revision: 652086
|
||||
- X11-devel is not needed
|
||||
- new version 1.3.17
|
||||
- rediff winpusle configure patch
|
||||
|
||||
* Tue Mar 15 2011 ahmad <ahmad> 1:1.3.15-4.mga1
|
||||
+ Revision: 72084
|
||||
- add a runtime requires on libfontconfig, wine needs to dlopen libfontconfig
|
||||
to make CJK fonts show correctly in winecfg, (still trying to fix mga#235)
|
||||
+ Zombie Ryushu <ryushu@mandriva.org>
|
||||
- Reset Releaseflag
|
||||
- Upgrade to 1.3.16
|
||||
- add X11-devel
|
||||
- compile with gstreamer
|
||||
- Add gettext-devel
|
||||
|
||||
* Mon Mar 14 2011 ahmad <ahmad> 1:1.3.15-3.mga1
|
||||
+ Revision: 71395
|
||||
- add BR fontconfig-devel, should really fix the winecfg UI translations (mga#235)
|
||||
* Sun Mar 13 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.15-2
|
||||
+ Revision: 644144
|
||||
- Upgrade to 1.3.15 and restore Winepulse patch
|
||||
|
||||
* Sun Mar 13 2011 ahmad <ahmad> 1:1.3.15-2.mga1
|
||||
+ Revision: 70893
|
||||
- add BR gettext-devel, this should fix the winecfg UI translations (mga#235)
|
||||
- add more BR
|
||||
* Sat Feb 26 2011 Funda Wang <fwang@mandriva.org> 1:1.3.14-2
|
||||
+ Revision: 639995
|
||||
- rebuild
|
||||
|
||||
* Fri Mar 04 2011 ahmad <ahmad> 1:1.3.15-1.mga1
|
||||
+ Revision: 64272
|
||||
- update to 1.3.15
|
||||
* Fri Feb 18 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.14-1
|
||||
+ Revision: 638605
|
||||
- Update to 1.3.14
|
||||
|
||||
* Sun Feb 20 2011 ahmad <ahmad> 1:1.3.14-1.mga1
|
||||
+ Revision: 54479
|
||||
- update to 1.3.14
|
||||
* Sat Feb 05 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.13-1
|
||||
+ Revision: 636021
|
||||
- Update to 1.3.13
|
||||
|
||||
* Fri Feb 04 2011 ahmad <ahmad> 1:1.3.13-1.mga1
|
||||
+ Revision: 46976
|
||||
- update to 1.3.13
|
||||
|
||||
* Mon Jan 24 2011 ahmad <ahmad> 1:1.3.12-1.mga1
|
||||
+ Revision: 37896
|
||||
- update the winepulse patches
|
||||
- rename wine-mdkconf to wine-mgaconf and regenerate it
|
||||
- drop an old conflicts
|
||||
- imported package wine
|
||||
|
||||
|
||||
* Fri Jan 24 2011 Ahmad Samir <ahmadsamir3891@gmail.com> 1:1.3.12-1.mga.1
|
||||
- update to 1.3.12
|
||||
* Wed Jan 26 2011 Zombie Ryushu <ryushu@mandriva.org> 1:1.3.12-1
|
||||
+ Revision: 633001
|
||||
- remove deprecated patch preventing building
|
||||
- Upgrade to 1.3.12
|
||||
|
||||
* Fri Jan 07 2011 Ahmad Samir <ahmadsamir@mandriva.org> 1:1.3.11-1mdv2011.0
|
||||
+ Revision: 629667
|
||||
|
|
@ -1275,7 +1239,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.30
|
||||
- new release: 0.9.32
|
||||
drop P112 (fixed upstream)
|
||||
|
||||
* Thu Jan 11 2007 Anssi Hannula <anssi@mandriva.org> 0.9.29-1mdv2007.1
|
||||
|
|
|
|||
2669
winepulse-0.39.patch
Normal file
2669
winepulse-0.39.patch
Normal file
File diff suppressed because it is too large
Load diff
60
winepulse-configure.ac-1.3.22.patch
Normal file
60
winepulse-configure.ac-1.3.22.patch
Normal 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
49
winepulse-winecfg-1.3.11.patch
Normal 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"
|
||||
Loading…
Add table
Reference in a new issue