rpms/wine/F-10 winepulse-0.24.patch, NONE, 1.1 .cvsignore, 1.71, 1.72 sources, 1.72, 1.73 wine.spec, 1.98, 1.99 winepulse-0.20.patch, 1.1, NONE
Andreas Bierfert
awjb at fedoraproject.org
Tue Apr 7 13:55:12 UTC 2009
- Previous message: rpms/wine/F-9 winepulse-0.24.patch, NONE, 1.1 .cvsignore, 1.70, 1.71 sources, 1.71, 1.72 wine.spec, 1.100, 1.101 winepulse-0.20.patch, 1.1, NONE
- Next message: rpms/kexec-tools/devel kexec-tools.spec, 1.132, 1.133 mkdumprd, 1.26, 1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/pkgs/rpms/wine/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13232/F-10
Modified Files:
.cvsignore sources wine.spec
Added Files:
winepulse-0.24.patch
Removed Files:
winepulse-0.20.patch
Log Message:
- upgrade
winepulse-0.24.patch:
--- NEW FILE winepulse-0.24.patch ---
diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
new file mode 100644
index 0000000..327f225
--- /dev/null
+++ b/dlls/winepulse.drv/Makefile.in
@@ -0,0 +1,16 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+MODULE = winepulse.drv
+IMPORTS = dxguid uuid winmm user32 advapi32 kernel32
+EXTRALIBS = @PULSELIBS@
+
+C_SRCS = dsoutput.c \
+ waveout.c \
+ wavein.c \
+ pulse.c
+
+ at MAKE_DLL_RULES@
+
+ at DEPENDENCIES@ # everything below this line is overwritten by make depend
diff --git a/dlls/winepulse.drv/dsoutput.c b/dlls/winepulse.drv/dsoutput.c
new file mode 100644
index 0000000..b37313a
--- /dev/null
+++ b/dlls/winepulse.drv/dsoutput.c
@@ -0,0 +1,576 @@
+/*
+ * Wine Driver for PulseAudio - DSound Output Functionality
+ * http://pulseaudio.org/
+ *
+ * Copyright 2009 Arthur Talyor <theycallhimart at gmail.com>
+ *
+ * Conatins code from other wine multimedia 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 "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winerror.h"
+#include "mmddk.h"
+#include "dsound.h"
+#include "dsdriver.h"
+#include "winreg.h"
+
+#include <winepulse.h>
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dspulse);
+
+#if HAVE_PULSEAUDIO
+
+/*======================================================================*
+ * Low level DSOUND implementation *
+ *======================================================================*/
+
+/* A buffer is allocated with a pointer indicating the read position in the
+ * buffer. The pulse write callback reads data from the buffer, updating the
+ * read pointer to the location at the end of the read. Upon reaching the end
+ * or attempting to read past the end of buffer the read pointer wraps around
+ * to the beginning again. DirectSound applications can write anywhere in the
+ * buffer at anytime without locking and can know the location of the read
+ * pointer. The position of the read pointer cannot be changed by the
+ * application and access to it uses a locking scheme. A fake pointer
+ * indicating estimated playback position is also available to the application.
+ * Applications can potentially write to the same area of memory which is also
+ * being read by the pulse thread. However, this is uncommon as directsound
+ * applications know where pulse should be reading from via the pointer
+ * locations and MSDN says that such an operation should be avoided with the
+ * results being undefined.
+ */
+
+/* Fragment lengths try to be a power of two close to 10ms worth of data. See
+ * dlls/dsound/mixer.c
+ */
+static int fragment_length(pa_sample_spec *s) {
+ if (s->rate <= 12800)
+ return 128 * pa_frame_size(s);
+
+ if (s->rate <= 25600)
+ return 256 * pa_frame_size(s);
+
+ if (s->rate <= 51200)
+ return 512 * pa_frame_size(s);
+
+ return 1024 * pa_frame_size(s);
+}
+
+/* Callback from the pulse thread for stream data */
+static void DSPULSE_BufferReadCallback(pa_stream *s, size_t nbytes, void *userdata) {
+ IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)userdata;
+
+ if (!This->buffer)
+ return;
+
+ /* Fraglens are always powers of 2 */
+ nbytes+= This->fraglen - 1;
+ nbytes&= ~(This->fraglen - 1);
+
+ /* If we advance more than 10 fragments at a time it appears that the buffer
+ * pointer is never advancing because of wrap-around. Evil magic numbers. */
+ if (nbytes > This->fraglen * 5)
+ nbytes = This->fraglen * 5;
+
+ TRACE("Reading %u bytes.\n", nbytes);
+
+ if (This->buffer_read_offset + nbytes <= This->buffer_length) {
+ pa_stream_write(s, This->buffer + This->buffer_read_offset, nbytes, NULL, 0, PA_SEEK_RELATIVE);
+ This->buffer_play_offset = This->buffer_read_offset;
+ This->buffer_read_offset += nbytes;
+ } else {
+ size_t write_length = This->buffer_length - This->buffer_read_offset;
+ nbytes -= write_length;
+ pa_stream_write(s, This->buffer + This->buffer_read_offset, write_length, NULL, 0, PA_SEEK_RELATIVE);
+ pa_stream_write(s, This->buffer, nbytes, NULL, 0, PA_SEEK_RELATIVE);
+ This->buffer_play_offset = This->buffer_read_offset;
+ This->buffer_read_offset = nbytes;
+ }
+
+ This->buffer_read_offset %= This->buffer_length;
+}
+
+/* Called when the stream underruns. Just for information */
+static void DSPULSE_BufferUnderflowCallback(pa_stream *s, void *userdata) {
+ WARN("(%p) underrun.\n", userdata);
+}
+
+/* Connects a stream to the server. Does not update
+ * IDsDriverBufferImpl->fraglen. Does not lock the pulse mainloop or free
+ * objects in case of failure. This should be handled by the calling function.
+ */
+static HRESULT DSPULSE_ConnectStream(IDsDriverBufferImpl* This) {
+ pa_buffer_attr ba_request;
+ const pa_buffer_attr *ba_obtained;
+ char c[PA_SAMPLE_SPEC_SNPRINT_MAX];
+ pa_stream_flags_t stream_flags = PA_STREAM_START_CORKED;
+
+#if PA_PROTOCOL_VERSION >= 14
+ /* We are a "fragment wait based" application, so this flag should be
+ * acceptable. */
+ stream_flags |= PA_STREAM_EARLY_REQUESTS;
+#elif PA_PROTOCOL_VERSION >= 13 && PA_API_VERSION >= 12
+ stream_flags |= PA_STREAM_ADJUST_LATENCY;
+#endif
+
+ pa_sample_spec_snprint(c, PA_SAMPLE_SPEC_SNPRINT_MAX, &This->sample_spec);
+ TRACE("Sample spec %s fragment size %u.\n", c, This->fraglen);
+
+ ba_request.tlength = This->fraglen * 4; // ~40ms
+ ba_request.minreq = This->fraglen; // ~10ms
+ ba_request.prebuf = (uint32_t)-1; // same as tlength
+ ba_request.maxlength = This->buffer_length; // 2^x = ~3s
+
+ TRACE("Asking for buffer tlength:%u (%llums) minreq:%u (%llums)\n",
+ ba_request.tlength, pa_bytes_to_usec(ba_request.tlength, &This->sample_spec)/1000,
+ ba_request.minreq, pa_bytes_to_usec(ba_request.minreq, &This->sample_spec)/1000);
+
+ This->stream = pa_stream_new(PULSE_context, "DirectSound Buffer", &This->sample_spec, NULL);
+ if (!This->stream) return DSERR_BADFORMAT;
+
+ pa_stream_set_state_callback(This->stream, PULSE_StreamStateCallback, This);
+ pa_stream_set_write_callback(This->stream, DSPULSE_BufferReadCallback, This);
+ pa_stream_set_underflow_callback(This->stream, DSPULSE_BufferUnderflowCallback, This);
+
+ TRACE("Attempting to connect (%p)->stream for playback on %s\n", This, WOutDev[This->drv->wDevID].device_name);
+ pa_stream_connect_playback(This->stream, WOutDev[This->drv->wDevID].device_name, &ba_request, stream_flags, NULL, NULL);
+ for (;;) {
+ pa_context_state_t cstate = pa_context_get_state(PULSE_context);
+ pa_stream_state_t sstate = pa_stream_get_state(This->stream);
+
+ if (cstate == PA_CONTEXT_FAILED || cstate == PA_CONTEXT_TERMINATED ||
+ sstate == PA_STREAM_FAILED || sstate == PA_STREAM_TERMINATED) {
+ ERR("Failed to connect stream context object: %s\n", pa_strerror(pa_context_errno(PULSE_context)));
+ return DSERR_BUFFERLOST;
+ }
+
+ if (sstate == PA_STREAM_READY)
+ break;
+
[...2991 lines suppressed...]
+#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;
+typedef struct IDsDriverImpl IDsDriverImpl;
+typedef struct IDsDriverBufferImpl IDsDriverBufferImpl;
+
+struct IDsDriverImpl {
+ /* IUnknown fields */
+ const IDsDriverVtbl *lpVtbl;
+ LONG ref;
+
+ IDsDriverBufferImpl *primary;
+ UINT wDevID;
+};
+
+struct IDsDriverBufferImpl {
+ const IDsDriverBufferVtbl *lpVtbl;
+ IDsDriverImpl* drv;
+ LONG ref;
+ pa_stream *stream;
+ pa_sample_spec sample_spec;
+ pa_cvolume volume;
+
+ PBYTE buffer;
+ DWORD buffer_length;
+ DWORD buffer_read_offset;
+ DWORD buffer_play_offset;
+ DWORD fraglen;
+};
+
+/* 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 {
+ volatile INT state; /* one of the WINE_WS_ manifest constants */
+ WAVEOPENDESC waveDesc;
+ WORD wFlags;
+
+ pa_stream *stream; /* The PulseAudio stream */
+ const pa_timing_info *timing_info;
+ pa_sample_spec sample_spec; /* Sample spec of this stream / device */
+ pa_cvolume volume;
+ pa_buffer_attr buffer_attr;
+
+ /* waveIn / waveOut wavaHdr information */
+ 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 */
+
+ /* Virtual stream positioning information */
+ DWORD last_reset; /* When the last reset occured, as pa stream time doesn't reset */
+ struct timeval last_header; /* When the last wavehdr was received, only updated when audio is not playing yet */
+ BOOL is_releasing; /* Whether we are releasing wavehdrs */
+ struct timeval started_releasing; /* When wavehdr releasing started, for comparison to queued written wavehdrs */
+ DWORD releasing_offset; /* How much audio has been released prior when releasing started in this instance */
+
+ /* waveIn */
+ 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 */
+ DWORD fraglen;
+
+ /* 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 */
+void PULSE_WaitForOperation(pa_operation *o);
+void PULSE_StreamSuccessCallback(pa_stream *s, int success, void *userdata);
+void PULSE_StreamStateCallback(pa_stream *s, void *userdata);
+void PULSE_StreamRequestCallback(pa_stream *s, size_t n, void *userdata);
+void PULSE_StreamUnderflowCallback(pa_stream *s, void *userdata);
+void PULSE_StreamOverflowCallback(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);
+BOOL PULSE_SetupFormat(LPWAVEFORMATEX wf, pa_sample_spec *ss);
+void PULSE_GetMMTime(const pa_timing_info *t, pa_sample_spec *s, size_t last_reset, LPMMTIME lpTime);
+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);
+const char * PULSE_getCmdString(enum win_wm_message msg);
+
+/* dsoutput.c */
+DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv);
+DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc);
+#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-10/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore 24 Feb 2009 20:45:07 -0000 1.71
+++ .cvsignore 7 Apr 2009 13:54:42 -0000 1.72
@@ -1 +1 @@
-wine-1.1.15-fe.tar.bz2
+wine-1.1.18-fe.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-10/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources 24 Feb 2009 20:45:07 -0000 1.72
+++ sources 7 Apr 2009 13:54:42 -0000 1.73
@@ -1 +1 @@
-cfeb6cfd7404c2fed2c9f2623976ea7e wine-1.1.15-fe.tar.bz2
+1933049a7cc725bcb488c6669fa5ca9e wine-1.1.18-fe.tar.bz2
Index: wine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-10/wine.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- wine.spec 24 Feb 2009 20:45:07 -0000 1.98
+++ wine.spec 7 Apr 2009 13:54:42 -0000 1.99
@@ -1,5 +1,5 @@
Name: wine
-Version: 1.1.15
+Version: 1.1.18
Release: 1%{?dist}
Summary: A Windows 16/32/64 bit emulator
@@ -43,7 +43,7 @@
# see http://bugs.winehq.org/show_bug.cgi?id=10495
# and http://art.ified.ca/?page_id=40
Patch400: http://art.ified.ca/downloads/winepulse-0.17-configure.ac.patch
-Patch401: http://art.ified.ca/downloads/winepulse-0.20.patch
+Patch401: http://art.ified.ca/downloads/winepulse-0.24.patch
Patch402: http://art.ified.ca/downloads/adding-pulseaudio-to-winecfg.patch
Source402: README-FEDORA-PULSEAUDIO
@@ -53,7 +53,7 @@
Patch2: wine-desktop-mime.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: i386
+ExclusiveArch: %{ix86}
# BR: All builds
BuildRequires: bison
@@ -402,15 +402,12 @@
%{_bindir}/regsvr32
%{_bindir}/wine
%{_bindir}/wineboot
-%{_bindir}/winebrowser
%{_bindir}/wineconsole
%{_bindir}/wineprefixcreate
%{_mandir}/man1/wineprefixcreate.1*
%{_bindir}/winecfg
-%{_bindir}/uninstaller
%{_libdir}/wine/cacls.exe.so
%{_libdir}/wine/expand.exe.so
-%{_libdir}/wine/winhelp.exe16
%{_libdir}/wine/winhlp32.exe.so
%{_libdir}/wine/msiexec.exe.so
%{_libdir}/wine/net.exe.so
@@ -438,11 +435,7 @@
%lang(fr) %{_mandir}/fr.UTF-8/man1/*
%{_datadir}/wine/generic.ppd
%{_datadir}/wine/wine.inf
-%{_bindir}/wine-kthread
%{_bindir}/wine-preloader
-%{_bindir}/wine-pthread
-# < 0.9.60
-#%{_bindir}/winelauncher
%{_bindir}/wineserver
%{_libdir}/libwine.so.1*
%dir %{_libdir}/wine
@@ -458,7 +451,6 @@
%{_libdir}/wine/authz.dll.so
%{_libdir}/wine/avicap32.dll.so
%{_libdir}/wine/avifil32.dll.so
-%{_libdir}/wine/avifile.dll16
%{_libdir}/wine/browseui.dll.so
%{_libdir}/wine/cabinet.dll.so
%{_libdir}/wine/cards.dll.so
@@ -468,9 +460,7 @@
%{_libdir}/wine/comcat.dll.so
%{_libdir}/wine/comctl32.dll.so
%{_libdir}/wine/comdlg32.dll.so
-%{_libdir}/wine/comm.drv16
%{_libdir}/wine/commdlg.dll16
-%{_libdir}/wine/compobj.dll16
%{_libdir}/wine/compstui.dll.so
%{_libdir}/wine/credui.dll.so
%{_libdir}/wine/crtdll.dll.so
@@ -480,9 +470,7 @@
%{_libdir}/wine/cryptnet.dll.so
%{_libdir}/wine/cryptui.dll.so
%{_libdir}/wine/ctapi32.dll.so
-%{_libdir}/wine/ctl3d.dll16
%{_libdir}/wine/ctl3d32.dll.so
-%{_libdir}/wine/ctl3dv2.dll16
%{_libdir}/wine/d3d10.dll.so
%{_libdir}/wine/d3d10core.dll.so
%{_libdir}/wine/d3dim.dll.so
@@ -497,8 +485,6 @@
%{_libdir}/wine/devenum.dll.so
%{_libdir}/wine/dinput.dll.so
%{_libdir}/wine/dinput8.dll.so
-%{_libdir}/wine/dispdib.dll16
-%{_libdir}/wine/display.drv16
%{_libdir}/wine/dmband.dll.so
%{_libdir}/wine/dmcompos.dll.so
%{_libdir}/wine/dmime.dll.so
@@ -543,7 +529,6 @@
%{_libdir}/wine/ifsmgr.vxd.so
%{_libdir}/wine/imaadp32.acm.so
%{_libdir}/wine/imagehlp.dll.so
-%{_libdir}/wine/imm.dll16
%{_libdir}/wine/imm32.dll.so
%{_libdir}/wine/inetcomm.dll.so
%{_libdir}/wine/inetmib1.dll.so
@@ -556,14 +541,12 @@
%{_libdir}/wine/itss.dll.so
%{_libdir}/wine/jscript.dll.so
%{_libdir}/wine/kernel32.dll.so
-%{_libdir}/wine/keyboard.drv16
%{_libdir}/wine/krnl386.exe16
%{_libdir}/wine/loadperf.dll.so
%{_libdir}/wine/localspl.dll.so
%{_libdir}/wine/localui.dll.so
%{_libdir}/wine/lodctr.exe.so
%{_libdir}/wine/lz32.dll.so
-%{_libdir}/wine/lzexpand.dll16
%{_libdir}/wine/mapi32.dll.so
%{_libdir}/wine/mciavi32.dll.so
%{_libdir}/wine/mcicda.dll.so
@@ -575,10 +558,8 @@
%{_libdir}/wine/mmsystem.dll16
%{_libdir}/wine/monodebg.vxd.so
%{_libdir}/wine/mountmgr.sys.so
-%{_libdir}/wine/mouse.drv16
%{_libdir}/wine/mpr.dll.so
%{_libdir}/wine/mprapi.dll.so
-%{_libdir}/wine/msacm.dll16
%{_libdir}/wine/msacm32.dll.so
%{_libdir}/wine/msacm32.drv.so
%{_libdir}/wine/msadp32.acm.so
@@ -620,20 +601,12 @@
%{_libdir}/wine/objsel.dll.so
%{_libdir}/wine/odbc32.dll.so
%{_libdir}/wine/odbccp32.dll.so
-%{_libdir}/wine/ole2.dll16
-%{_libdir}/wine/ole2conv.dll16
-%{_libdir}/wine/ole2disp.dll16
-%{_libdir}/wine/ole2nls.dll16
-%{_libdir}/wine/ole2prox.dll16
-%{_libdir}/wine/ole2thk.dll16
%{_libdir}/wine/ole32.dll.so
%{_libdir}/wine/oleacc.dll.so
%{_libdir}/wine/oleaut32.dll.so
-%{_libdir}/wine/olecli.dll16
%{_libdir}/wine/olecli32.dll.so
%{_libdir}/wine/oledlg.dll.so
%{_libdir}/wine/olepro32.dll.so
-%{_libdir}/wine/olesvr.dll16
%{_libdir}/wine/olesvr32.dll.so
%{_libdir}/wine/olethk32.dll.so
%{_libdir}/wine/pdh.dll.so
@@ -649,7 +622,6 @@
%{_libdir}/wine/qmgrprxy.dll.so
%{_libdir}/wine/quartz.dll.so
%{_libdir}/wine/query.dll.so
-%{_libdir}/wine/rasapi16.dll16
%{_libdir}/wine/rasapi32.dll.so
%{_libdir}/wine/rasdlg.dll.so
%{_libdir}/wine/resutils.dll.so
@@ -676,13 +648,10 @@
%{_libdir}/wine/slc.dll.so
%{_libdir}/wine/snmpapi.dll.so
%{_libdir}/wine/softpub.dll.so
-%{_libdir}/wine/sound.drv16
%{_libdir}/wine/spoolsv.exe.so
%{_libdir}/wine/stdole2.tlb.so
%{_libdir}/wine/stdole32.tlb.so
%{_libdir}/wine/sti.dll.so
-%{_libdir}/wine/storage.dll16
-%{_libdir}/wine/stress.dll16
%{_libdir}/wine/svchost.exe.so
%{_libdir}/wine/svrapi.dll.so
%{_libdir}/wine/sxs.dll.so
@@ -690,7 +659,6 @@
%{_libdir}/wine/tapi32.dll.so
%{_libdir}/wine/toolhelp.dll16
%{_libdir}/wine/traffic.dll.so
-%{_libdir}/wine/typelib.dll16
%{_libdir}/wine/unicows.dll.so
%{_libdir}/wine/unlodctr.exe.so
%{_libdir}/wine/updspapi.dll.so
@@ -711,11 +679,6 @@
%{_libdir}/wine/vtdapi.vxd.so
%{_libdir}/wine/vwin32.vxd.so
%{_libdir}/wine/w32skrnl.dll.so
-%{_libdir}/wine/w32sys.dll16
-%{_libdir}/wine/win32s16.dll16
-%{_libdir}/wine/win87em.dll16
-%{_libdir}/wine/winaspi.dll16
-%{_libdir}/wine/windebug.dll16
%{_libdir}/wine/wineaudioio.drv.so
%{_libdir}/wine/winedos.dll.so
%{_libdir}/wine/wineoss.drv.so
@@ -727,15 +690,12 @@
%{_libdir}/wine/winhttp.dll.so
%{_libdir}/wine/wininet.dll.so
%{_libdir}/wine/winmm.dll.so
-%{_libdir}/wine/winnls.dll16
%{_libdir}/wine/winnls32.dll.so
%{_libdir}/wine/winsock.dll16
%{_libdir}/wine/winspool.drv.so
%{_libdir}/wine/wmi.dll.so
%{_libdir}/wine/spoolss.dll.so
-%{_libdir}/wine/winoldap.mod16
%{_libdir}/wine/winscard.dll.so
-%{_libdir}/wine/wintab.dll16
%{_libdir}/wine/wintab32.dll.so
%{_libdir}/wine/wintrust.dll.so
%{_libdir}/wine/wnaspi32.dll.so
@@ -764,11 +724,47 @@
%{_libdir}/wine/xinput1_3.dll.so
%{_libdir}/wine/xinput9_1_0.dll.so
%{_sysconfdir}/ld.so.conf.d/wine-32.conf
+# 16bit
+%{_libdir}/wine/avifile.dll16.so
+%{_libdir}/wine/comm.drv16.so
+%{_libdir}/wine/compobj.dll16.so
+%{_libdir}/wine/ctl3d.dll16.so
+%{_libdir}/wine/ctl3dv2.dll16.so
+%{_libdir}/wine/dispdib.dll16.so
+%{_libdir}/wine/display.drv16.so
+%{_libdir}/wine/imm.dll16.so
+%{_libdir}/wine/keyboard.drv16.so
+%{_libdir}/wine/lzexpand.dll16.so
+%{_libdir}/wine/mciqtz32.dll.so
+%{_libdir}/wine/mouse.drv16.so
+%{_libdir}/wine/msacm.dll16.so
+%{_libdir}/wine/ole2.dll16.so
+%{_libdir}/wine/ole2conv.dll16.so
+%{_libdir}/wine/ole2disp.dll16.so
+%{_libdir}/wine/ole2nls.dll16.so
+%{_libdir}/wine/ole2prox.dll16.so
+%{_libdir}/wine/ole2thk.dll16.so
+%{_libdir}/wine/olecli.dll16.so
+%{_libdir}/wine/olesvr.dll16.so
+%{_libdir}/wine/rasapi16.dll16.so
+%{_libdir}/wine/sound.drv16.so
+%{_libdir}/wine/storage.dll16.so
+%{_libdir}/wine/stress.dll16.so
+%{_libdir}/wine/twain.dll16.so
+%{_libdir}/wine/typelib.dll16.so
+%{_libdir}/wine/w32sys.dll16.so
+%{_libdir}/wine/win32s16.dll16.so
+%{_libdir}/wine/win87em.dll16.so
+%{_libdir}/wine/winaspi.dll16.so
+%{_libdir}/wine/windebug.dll16.so
+%{_libdir}/wine/winhelp.exe16.so
+%{_libdir}/wine/winnls.dll16.so
+%{_libdir}/wine/winoldap.mod16.so
+%{_libdir}/wine/wintab.dll16.so
%files tools
%defattr(-,root,root,-)
%{_bindir}/notepad
-%{_bindir}/progman
%{_bindir}/winedbg
%{_bindir}/winedump
%{_bindir}/winefile
@@ -826,7 +822,6 @@
%files twain
%defattr(-,root,root,-)
-%{_libdir}/wine/twain.dll16
%{_libdir}/wine/twain_32.dll.so
%{_libdir}/wine/sane.ds.so
@@ -869,6 +864,18 @@
%{_libdir}/wine/winepulse.drv.so
%changelog
+* Mon Mar 30 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.18-1
+- version upgrade (#490672, #491321)
+- winepulse update
+
+* Sun Mar 15 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 1.1.15-3
+— Make sure F11 font packages have been built with F11 fontforge
+
+* Tue Feb 24 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.15-2
+- switch from i386 to ix86
+
* Sun Feb 15 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.1.15-1
- version upgrade
--- winepulse-0.20.patch DELETED ---
- Previous message: rpms/wine/F-9 winepulse-0.24.patch, NONE, 1.1 .cvsignore, 1.70, 1.71 sources, 1.71, 1.72 wine.spec, 1.100, 1.101 winepulse-0.20.patch, 1.1, NONE
- Next message: rpms/kexec-tools/devel kexec-tools.spec, 1.132, 1.133 mkdumprd, 1.26, 1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list