From a97d537f32b00a202e06963ea777961fe113a124 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Wed, 14 Jul 2010 20:30:44 +0000 Subject: [PATCH] - pull from F-12, modify for missing requires --- .cvsignore | 2 +- sources | 2 +- wine.spec | 132 ++++++++++++------ ...patch => winepulse-0.38-configure.ac.patch | 14 +- winepulse-0.36.patch => winepulse-0.38.patch | 24 ++-- 5 files changed, 114 insertions(+), 60 deletions(-) rename winepulse-0.35-configure.ac.patch => winepulse-0.38-configure.ac.patch (88%) rename winepulse-0.36.patch => winepulse-0.38.patch (99%) diff --git a/.cvsignore b/.cvsignore index 3bcadfd..9fc1ac0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wine-1.2-rc5.tar.bz2 +wine-1.2-rc7.tar.bz2 diff --git a/sources b/sources index 376d4a1..c6f48ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a7911aec84ca059e623978db17fba19 wine-1.2-rc5.tar.bz2 +05cc63418e603f3d689bcaa7c7768d01 wine-1.2-rc7.tar.bz2 diff --git a/wine.spec b/wine.spec index a404712..66ef0c2 100644 --- a/wine.spec +++ b/wine.spec @@ -1,13 +1,13 @@ %define no64bit 0 Name: wine Version: 1.2.0 -Release: 0.5.rc5%{?dist} +Release: 0.7.rc7%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators License: LGPLv2+ URL: http://www.winehq.org/ -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2-rc5.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-1.2-rc7.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf @@ -44,9 +44,8 @@ Patch200: wine-imagemagick-6.5.patch # 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 -# rebased for .42 see #580073 -Patch400: winepulse-0.35-configure.ac.patch -Patch401: http://art.ified.ca/downloads/winepulse/winepulse-0.36.patch +Patch400: http://art.ified.ca/downloads/winepulse/winepulse-0.38-configure.ac.patch +Patch401: http://art.ified.ca/downloads/winepulse/winepulse-0.38.patch Patch402: http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch Source402: README-FEDORA-PULSEAUDIO @@ -109,11 +108,16 @@ BuildRequires: dbus-devel hal-devel BuildRequires: gnutls-devel BuildRequires: pulseaudio-libs-devel BuildRequires: gsm-devel -BuildRequires: openal-soft-devel BuildRequires: libv4l-devel BuildRequires: fontpackages-devel -BuildRequires: icoutils BuildRequires: ImageMagick-devel + +%if 0%{?fedora} > 9 +BuildRequires: icoutils +BuildRequires: openal-soft-devel +%endif + + Requires: wine-desktop = %{version}-%{release} Requires: wine-fonts = %{version}-%{release} @@ -223,7 +227,10 @@ Requires: wine-marlett-fonts = %{version}-%{release} #Requires: wine-tahoma-fonts = %{version}-%{release} Requires: wine-symbol-fonts = %{version}-%{release} # intermediate fix for #593140 -Requires: liberation-sans-fonts liberation-serif-fonts liberation-narrow-fonts +Requires: liberation-sans-fonts liberation-serif-fonts liberation-mono-fonts +%if 0%{?fedora} > 12 || 0%{?rhel} > 6 +Requires: liberation-narrow-fonts +%endif %description fonts %{summary} @@ -400,6 +407,7 @@ Requires: wine-core = %{version}-%{release} %description oss This package adds an oss driver for wine. +%if 0%{?fedora} > 9 %package openal Summary: Openal support for wine Group: System Environment/Libraries @@ -407,15 +415,15 @@ Requires: wine-core = %{version}-%{release} %description openal This package adds an openal driver for wine. - +%endif %prep -%setup -q -n %{name}-1.2-rc5 +%setup -q -n %{name}-1.2-rc7 %patch1 %patch100 %patch200 -%patch400 +%patch400 -p1 %patch401 -p1 %patch402 -p1 %patch1000 @@ -462,69 +470,86 @@ install -p -m 644 %{SOURCE201} \ %{buildroot}%{_datadir}/desktop-directories/Wine.directory -# install desktop files +# extract and install icons +%if 0%{?fedora} > 9 mkdir -p %{buildroot}%{_datadir}/pixmaps -install -p -m 644 programs/winemenubuilder/wine.xpm \ - %{buildroot}%{_datadir}/pixmaps/wine.xpm +icotool -x --width=32 --height=32 --bit-depth=32 -o dlls/user32/resources/ \ + dlls/user32/resources/oic_winlogo.ico +install -p -m 644 dlls/user32/resources/*png \ + %{buildroot}%{_datadir}/pixmaps/wine.png icotool -x --width=32 --height=32 --bit-depth=32 -o programs/notepad/ \ programs/notepad/notepad.ico install -p -m 644 programs/notepad/notepad*png \ %{buildroot}%{_datadir}/pixmaps/notepad.png -desktop-file-install \ - --vendor=fedora \ - --dir=%{buildroot}%{_datadir}/applications \ - %{SOURCE100} icotool -x --width=32 --height=32 --bit-depth=32 -o programs/regedit/ \ programs/regedit/regedit.ico install -p -m 644 programs/regedit/regedit*png \ %{buildroot}%{_datadir}/pixmaps/regedit.png -desktop-file-install \ - --vendor=fedora \ - --dir=%{buildroot}%{_datadir}/applications \ - %{SOURCE101} icotool -x --width=32 --height=32 --bit-depth=32 -o programs/msiexec/ \ programs/msiexec/msiexec.ico install -p -m 644 programs/msiexec/msiexec*png \ %{buildroot}%{_datadir}/pixmaps/msiexec.png -desktop-file-install \ - --vendor=fedora \ - --dir=%{buildroot}%{_datadir}/applications \ - %{SOURCE102} icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winecfg/ \ programs/winecfg/winecfg.ico install -p -m 644 programs/winecfg/winecfg*png \ %{buildroot}%{_datadir}/pixmaps/winecfg.png -desktop-file-install \ - --vendor=fedora \ - --dir=%{buildroot}%{_datadir}/applications \ - %{SOURCE103} icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winefile/ \ programs/winefile/winefile.ico install -p -m 644 programs/winefile/winefile*png \ %{buildroot}%{_datadir}/pixmaps/winefile.png -desktop-file-install \ - --vendor=fedora \ - --dir=%{buildroot}%{_datadir}/applications \ - %{SOURCE104} icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winemine/ \ programs/winemine/winemine.ico install -p -m 644 programs/winemine/winemine*png \ %{buildroot}%{_datadir}/pixmaps/winemine.png -desktop-file-install \ - --vendor=fedora \ - --dir=%{buildroot}%{_datadir}/applications \ - %{SOURCE105} icotool -x --width=32 --height=32 --bit-depth=32 -o programs/winhlp32/ \ programs/winhlp32/winhelp.ico install -p -m 644 programs/winhlp32/winhelp*png \ %{buildroot}%{_datadir}/pixmaps/winhelp.png + +icotool -x --width=32 --height=32 --bit-depth=32 -o programs/wordpad/ \ + programs/wordpad/wordpad.ico +install -p -m 644 programs/wordpad/wordpad*png \ + %{buildroot}%{_datadir}/pixmaps/wordpad.png +%endif + +# install desktop files +desktop-file-install \ + --vendor=fedora \ + --dir=%{buildroot}%{_datadir}/applications \ + %{SOURCE100} + +desktop-file-install \ + --vendor=fedora \ + --dir=%{buildroot}%{_datadir}/applications \ + %{SOURCE101} + +desktop-file-install \ + --vendor=fedora \ + --dir=%{buildroot}%{_datadir}/applications \ + %{SOURCE102} + +desktop-file-install \ + --vendor=fedora \ + --dir=%{buildroot}%{_datadir}/applications \ + %{SOURCE103} + +desktop-file-install \ + --vendor=fedora \ + --dir=%{buildroot}%{_datadir}/applications \ + %{SOURCE104} + +desktop-file-install \ + --vendor=fedora \ + --dir=%{buildroot}%{_datadir}/applications \ + %{SOURCE105} + desktop-file-install \ --vendor=fedora \ --dir=%{buildroot}%{_datadir}/applications \ @@ -535,10 +560,6 @@ desktop-file-install \ --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE107} -icotool -x --width=32 --height=32 --bit-depth=32 -o programs/wordpad/ \ - programs/wordpad/wordpad.ico -install -p -m 644 programs/wordpad/wordpad*png \ - %{buildroot}%{_datadir}/pixmaps/wordpad.png desktop-file-install \ --vendor=fedora \ --dir=%{buildroot}%{_datadir}/applications \ @@ -657,8 +678,10 @@ update-desktop-database &>/dev/null || : %post oss -p /sbin/ldconfig %postun oss -p /sbin/ldconfig +%if 0%{?fedora} > 9 %post openal -p /sbin/ldconfig %postun openal -p /sbin/ldconfig +%endif %files %defattr(-,root,root,-) @@ -1116,7 +1139,6 @@ update-desktop-database &>/dev/null || : %{_datadir}/wine/generic.ppd %{_datadir}/wine/wine.inf %{_datadir}/wine/l_intl.nls -%{_datadir}/pixmaps/*xpm %files fonts %defattr(-,root,root,-) @@ -1124,30 +1146,37 @@ update-desktop-database &>/dev/null || : %files courier-fonts %defattr(-,root,root,-) +%doc COPYING.LIB %{_datadir}/fonts/wine-courier-fonts %files system-fonts %defattr(-,root,root,-) +%doc COPYING.LIB %{_datadir}/fonts/wine-system-fonts %files small-fonts %defattr(-,root,root,-) +%doc COPYING.LIB %{_datadir}/fonts/wine-small-fonts %files marlett-fonts +%doc COPYING.LIB %defattr(-,root,root,-) %{_datadir}/fonts/wine-marlett-fonts #%files ms-sans-serif-fonts #%defattr(-,root,root,-) +#%doc COPYING.LIB #%{_datadir}/fonts/wine-ms-sans-serif-fonts #%files tahoma-fonts #%defattr(-,root,root,-) +#%doc COPYING.LIB #%{_datadir}/fonts/wine-tahoma-fonts %files symbol-fonts %defattr(-,root,root,-) +%doc COPYING.LIB %{_datadir}/fonts/wine-symbol-fonts %files desktop @@ -1167,7 +1196,10 @@ update-desktop-database &>/dev/null || : %{_datadir}/desktop-directories/Wine.directory %{_sysconfdir}/xdg/menus/applications-merged/wine.menu %{_initrddir}/wine + +%if 0%{?fedora} > 9 %{_datadir}/pixmaps/*png +%endif # esd subpackage %files esd @@ -1248,11 +1280,25 @@ update-desktop-database &>/dev/null || : %defattr(-,root,root,-) %{_libdir}/wine/wineoss.drv.so +%if 0%{?fedora} > 9 %files openal %defattr(-,root,root,-) %{_libdir}/wine/openal32.dll.so +%endif %changelog +* Sun Jul 11 2010 Andreas Bierfert +- 1.2-0.7.rc7 +- version upgrade +- make sure font packages include the license file in case they are installed + standalone + +* Sun Jul 04 2010 Andreas Bierfert +- 1.2-0.6.rc6 +- version upgrade +- use new winelogo from user32 +- winepulse upgrade + * Sun Jun 27 2010 Andreas Bierfert - 1.2-0.5.rc5 - version upgrade diff --git a/winepulse-0.35-configure.ac.patch b/winepulse-0.38-configure.ac.patch similarity index 88% rename from winepulse-0.35-configure.ac.patch rename to winepulse-0.38-configure.ac.patch index 9d5132d..d44a4e6 100644 --- a/winepulse-0.35-configure.ac.patch +++ b/winepulse-0.38-configure.ac.patch @@ -1,6 +1,8 @@ ---- configure.ac.orig 2010-05-10 16:39:57.000000000 +0200 -+++ configure.ac 2010-05-10 16:42:54.000000000 +0200 -@@ -68,6 +68,7 @@ +diff --git a/configure.ac b/configure.ac +index 61f376e..6fe1261 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,6 +76,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]) @@ -8,7 +10,7 @@ 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]) -@@ -1361,6 +1362,31 @@ +@@ -1386,6 +1387,31 @@ then CFLAGS="$save_CFLAGS" fi @@ -40,7 +42,7 @@ 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" -@@ -1528,7 +1554,7 @@ +@@ -1553,7 +1579,7 @@ dnl **** Check for libodbc **** WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])]) dnl **** Check for any sound system **** @@ -49,7 +51,7 @@ "$ac_cv_header_sys_soundcard_h" != "yes" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_soundcard_h" != "yes" -a \ -@@ -2621,6 +2647,7 @@ +@@ -2648,6 +2674,7 @@ WINE_CONFIG_DLL(winenas.drv) WINE_CONFIG_DLL(wineoss.drv) WINE_CONFIG_DLL(wineps.drv) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) diff --git a/winepulse-0.36.patch b/winepulse-0.38.patch similarity index 99% rename from winepulse-0.36.patch rename to winepulse-0.38.patch index 7ea2ef1..6c4c271 100644 --- a/winepulse-0.36.patch +++ b/winepulse-0.38.patch @@ -831,10 +831,10 @@ index 0000000..9dd1f80 +} diff --git a/dlls/winepulse.drv/wavein.c b/dlls/winepulse.drv/wavein.c new file mode 100644 -index 0000000..8aea538 +index 0000000..af721b9 --- /dev/null +++ b/dlls/winepulse.drv/wavein.c -@@ -0,0 +1,588 @@ +@@ -0,0 +1,589 @@ +/* + * Wine Driver for PulseAudio - WaveIn Functionality + * http://pulseaudio.org/ @@ -1157,7 +1157,8 @@ index 0000000..8aea538 + TRACE("Asking to open %s for recording.\n", wdi->device_name); + pa_stream_connect_record(wwi->stream, wdi->device_name, &wwi->buffer_attr, + PA_STREAM_START_CORKED | -+ PA_STREAM_AUTO_TIMING_UPDATE); ++ PA_STREAM_AUTO_TIMING_UPDATE | ++ PA_STREAM_ADJUST_LATENCY); + + for (;;) { + pa_context_state_t cstate = pa_context_get_state(PULSE_context); @@ -1425,10 +1426,10 @@ index 0000000..8aea538 +#endif /* HAVE_PULSEAUDIO */ diff --git a/dlls/winepulse.drv/waveout.c b/dlls/winepulse.drv/waveout.c new file mode 100644 -index 0000000..989dff5 +index 0000000..99b7c18 --- /dev/null +++ b/dlls/winepulse.drv/waveout.c -@@ -0,0 +1,1024 @@ +@@ -0,0 +1,1029 @@ +/* + * Wine Driver for PulseAudio - WaveOut Functionality + * http://pulseaudio.org/ @@ -1472,6 +1473,9 @@ index 0000000..989dff5 + +#if HAVE_PULSEAUDIO + ++/* Use this to make the infinite wait not so infinite */ ++#define PULSE_INFINITE 10000 ++ +/* state diagram for waveOut writing: + * + * +---------+-------------+---------------+---------------------------------+ @@ -1628,6 +1632,8 @@ index 0000000..989dff5 + * Because of bugs pa_stream_set_buffer_attr() does not work on started + * streams for server version 0.9.11 to 0.9.14 */ + PULSE_WaitForOperation(pa_stream_set_buffer_attr(wwo->stream, &wwo->buffer_attr, PULSE_StreamSuccessCallback, wwo)); ++ TRACE("Triggering stream and hoping for the best\n"); ++ PULSE_WaitForOperation(pa_stream_trigger(wwo->stream, PULSE_StreamSuccessCallback, wwo)); + } + pa_threaded_mainloop_unlock(PULSE_ml); + } @@ -1651,8 +1657,8 @@ index 0000000..989dff5 + * - we hit the beginning of a running loop + * - we hit a wavehdr which hasn't finished playing + */ -+ if (lpWaveHdr == wwo->lpLoopPtr) { TRACE("loop %p\n", lpWaveHdr); return INFINITE; } -+ if (lpWaveHdr == wwo->lpPlayPtr) { TRACE("play %p\n", lpWaveHdr); return INFINITE; } ++ if (lpWaveHdr == wwo->lpLoopPtr) { TRACE("loop %p\n", lpWaveHdr); return PULSE_INFINITE; } ++ if (lpWaveHdr == wwo->lpPlayPtr) { TRACE("play %p\n", lpWaveHdr); return PULSE_INFINITE; } + + /* See if this data has been played, and if not, return when it will have been */ + wait = pa_bytes_to_usec(lpWaveHdr->reserved + lpWaveHdr->dwBufferLength, &wwo->sample_spec); @@ -1673,7 +1679,7 @@ index 0000000..989dff5 + } + /* No more wavehdrs */ + TRACE("Empty queue\n"); -+ return INFINITE; ++ return PULSE_INFINITE; +} + +/************************************************************************** @@ -2041,7 +2047,7 @@ index 0000000..989dff5 + /* Try and connect */ + TRACE("Connecting stream for playback on %s.\n", wdo->device_name); + pa_threaded_mainloop_lock(PULSE_ml); -+ pa_stream_connect_playback(wwo->stream, wdo->device_name, NULL, PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_ADJUST_LATENCY, NULL, NULL); ++ pa_stream_connect_playback(wwo->stream, wdo->device_name, &wwo->buffer_attr, PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_ADJUST_LATENCY, NULL, NULL); + + /* Wait for connection */ + for (;;) {