rpms/wine/EL-6 winepulse-0.38-configure.ac.patch, NONE, 1.1 winepulse-0.38.patch, NONE, 1.1 .cvsignore, 1.88, 1.89 sources, 1.89, 1.90 wine.spec, 1.123, 1.124 winepulse-0.35-configure.ac.patch, 1.2, NONE winepulse-0.36.patch, 1.1, NONE
Andreas Bierfert
awjb at fedoraproject.org
Wed Jul 14 20:30:44 UTC 2010
- Previous message: rpms/devhelp/devel .cvsignore, 1.29, 1.30 devhelp.spec, 1.124, 1.125 sources, 1.29, 1.30
- Next message: rpms/devhelp/devel devhelp-gtk3.patch, NONE, 1.1 devhelp.spec, 1.125, 1.126
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/pkgs/rpms/wine/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4860
Modified Files:
.cvsignore sources wine.spec
Added Files:
winepulse-0.38-configure.ac.patch winepulse-0.38.patch
Removed Files:
winepulse-0.35-configure.ac.patch winepulse-0.36.patch
Log Message:
- pull from F-12, modify for missing requires
winepulse-0.38-configure.ac.patch:
configure.ac | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
--- NEW FILE winepulse-0.38-configure.ac.patch ---
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])
+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])
@@ -1386,6 +1387,31 @@ then
CFLAGS="$save_CFLAGS"
fi
+dnl **** Check for PulseAudio ****
+AC_SUBST(PULSELIBS,"")
+AC_SUBST(PULSECFLAGS,"")
+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 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"
+ PULSECFLAGS="$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 ALSA 1.x ****
AC_SUBST(ALSALIBS,"")
if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
@@ -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 ****
-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 \
@@ -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)
+WINE_CONFIG_DLL(winepulse.drv)
WINE_CONFIG_DLL(winequartz.drv)
WINE_CONFIG_DLL(winex11.drv)
WINE_CONFIG_DLL(wing.dll16,enable_win16)
winepulse-0.38.patch:
Makefile.in | 14
pulse.c | 805 +++++++++++++++++++++++++++++++++++++++++
wavein.c | 589 ++++++++++++++++++++++++++++++
waveout.c | 1029 +++++++++++++++++++++++++++++++++++++++++++++++++++++
winepulse.drv.spec | 3
winepulse.h | 197 ++++++++++
6 files changed, 2637 insertions(+)
--- NEW FILE winepulse-0.38.patch ---
diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
new file mode 100644
index 0000000..ed48381
--- /dev/null
+++ b/dlls/winepulse.drv/Makefile.in
@@ -0,0 +1,14 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+MODULE = winepulse.drv
+IMPORTS = winmm user32 kernel32
+EXTRALIBS = @PULSELIBS@
+EXTRACFLAGS = @PULSEINCL@
+
+C_SRCS = waveout.c \
+ wavein.c \
+ pulse.c
+
+ at MAKE_DLL_RULES@
diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
new file mode 100644
index 0000000..9dd1f80
--- /dev/null
+++ b/dlls/winepulse.drv/pulse.c
@@ -0,0 +1,805 @@
+/*
+ * 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.
+ */
+ if (omr->msg_tosave < omr->msg_toget)
[...2274 lines suppressed...]
--- /dev/null
+++ b/dlls/winepulse.drv/winepulse.h
@@ -0,0 +1,197 @@
+/* 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 {
+ 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_StreamRequestCallback(pa_stream *s, size_t nbytes, void *userdata);
+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/EL-6/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- .cvsignore 2 Jul 2010 04:53:19 -0000 1.88
+++ .cvsignore 14 Jul 2010 20:30:43 -0000 1.89
@@ -1 +1 @@
-wine-1.2-rc5.tar.bz2
+wine-1.2-rc7.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/sources,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- sources 2 Jul 2010 04:53:19 -0000 1.89
+++ sources 14 Jul 2010 20:30:43 -0000 1.90
@@ -1 +1 @@
-7a7911aec84ca059e623978db17fba19 wine-1.2-rc5.tar.bz2
+05cc63418e603f3d689bcaa7c7768d01 wine-1.2-rc7.tar.bz2
Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/EL-6/wine.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- wine.spec 2 Jul 2010 04:53:19 -0000 1.123
+++ wine.spec 14 Jul 2010 20:30:43 -0000 1.124
@@ -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.pat
# 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 = %{ve
#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}-%{relea
%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}-%{relea
%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 <andreas.bierfert[AT]lowlatency.de>
+- 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 <andreas.bierfert[AT]lowlatency.de>
+- 1.2-0.6.rc6
+- version upgrade
+- use new winelogo from user32
+- winepulse upgrade
+
* Sun Jun 27 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.2-0.5.rc5
- version upgrade
--- winepulse-0.35-configure.ac.patch DELETED ---
--- winepulse-0.36.patch DELETED ---
- Previous message: rpms/devhelp/devel .cvsignore, 1.29, 1.30 devhelp.spec, 1.124, 1.125 sources, 1.29, 1.30
- Next message: rpms/devhelp/devel devhelp-gtk3.patch, NONE, 1.1 devhelp.spec, 1.125, 1.126
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list