[wine] 1.5.20-1
Andreas Bierfert
awjb at fedoraproject.org
Sun Dec 30 09:10:48 UTC 2012
commit 4067231e7fdcdc9c081da3d28a805f07d290ecd1
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date: Sun Dec 30 10:10:39 2012 +0100
1.5.20-1
- version upgrade
- upgraded winepulse
.gitignore | 4 +-
sources | 4 +-
wine-pulse-1.5.17.patch => wine-pulse-1.5.20.patch | 245 ++++++++++++--------
...winmm-Load-winealsa-if-winepulse-is-found.patch | 10 +-
wine.spec | 32 +++-
5 files changed, 188 insertions(+), 107 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bfdd074..33492d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
/wine-1.4.tar.bz2
/wine-1.4.tar.bz2.sign
-/wine-1.5.18.tar.bz2
-/wine-1.5.18.tar.bz2.sign
+/wine-1.5.20.tar.bz2
+/wine-1.5.20.tar.bz2.sign
diff --git a/sources b/sources
index 990c296..041b93b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6d7c2a55673423b7318db392ba7a7da9 wine-1.5.18.tar.bz2
-33f9e2becc972b01b08a38a6cf42cba4 wine-1.5.18.tar.bz2.sign
+ea1c3ec9935d1da1b0f50552d540c242 wine-1.5.20.tar.bz2
+d182d4d463c02325e430a600588478dc wine-1.5.20.tar.bz2.sign
diff --git a/wine-pulse-1.5.17.patch b/wine-pulse-1.5.20.patch
similarity index 95%
rename from wine-pulse-1.5.17.patch
rename to wine-pulse-1.5.20.patch
index 63d6379..7734be7 100644
--- a/wine-pulse-1.5.17.patch
+++ b/wine-pulse-1.5.20.patch
@@ -1,6 +1,5 @@
-diff -uhNr wine-1.5.17/configure wine-1.5.17-mm/configure
---- wine-1.5.17/configure 2012-11-09 19:46:37.000000000 +0100
-+++ wine-1.5.17-mm/configure 2012-11-12 19:24:06.932539040 +0100
+--- wine-1.5.20/configure 2012-12-21 20:14:41.000000000 +0100
++++ wine-1.5.20-winepulse/configure 2012-12-29 08:53:10.399489081 +0100
@@ -649,6 +649,8 @@
ALSALIBS
GSTREAMER_INCL
@@ -39,7 +38,7 @@ diff -uhNr wine-1.5.17/configure wine-1.5.17-mm/configure
# Check whether --with-sane was given.
if test "${with_sane+set}" = set; then :
withval=$with_sane;
-@@ -10734,6 +10744,87 @@
+@@ -10746,6 +10756,87 @@
fi
fi
@@ -127,7 +126,7 @@ diff -uhNr wine-1.5.17/configure wine-1.5.17-mm/configure
if test "x$with_gstreamer" != "xno"
then
ac_save_CPPFLAGS="$CPPFLAGS"
-@@ -11993,12 +12084,13 @@
+@@ -12005,12 +12096,13 @@
test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
@@ -143,17 +142,16 @@ diff -uhNr wine-1.5.17/configure wine-1.5.17-mm/configure
then
as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent."
fi
-@@ -15760,6 +15852,7 @@
+@@ -15896,6 +15988,7 @@
wine_fn_config_dll wineoss.drv enable_wineoss_drv
wine_fn_config_dll wineps.drv enable_wineps_drv install-lib,po
wine_fn_config_dll wineps16.drv16 enable_win16
+wine_fn_config_dll winepulse.drv enable_winepulse_drv
wine_fn_config_dll wineqtdecoder enable_wineqtdecoder
- wine_fn_config_dll winequartz.drv enable_winequartz_drv
wine_fn_config_dll winex11.drv enable_winex11_drv
-diff -uhNr wine-1.5.17/configure.ac wine-1.5.17-mm/configure.ac
---- wine-1.5.17/configure.ac 2012-11-09 19:46:37.000000000 +0100
-+++ wine-1.5.17-mm/configure.ac 2012-11-12 19:35:33.313361109 +0100
+ wine_fn_config_dll wing.dll16 enable_win16
+--- wine-1.5.20/configure.ac 2012-12-21 20:14:41.000000000 +0100
++++ wine-1.5.20-winepulse/configure.ac 2012-12-29 08:53:10.399489081 +0100
@@ -74,6 +74,7 @@
[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]),
@@ -162,7 +160,7 @@ diff -uhNr wine-1.5.17/configure.ac wine-1.5.17-mm/configure.ac
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])
-@@ -1482,6 +1483,30 @@
+@@ -1490,6 +1491,30 @@
[GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.])
fi
@@ -193,7 +191,7 @@ diff -uhNr wine-1.5.17/configure.ac wine-1.5.17-mm/configure.ac
dnl **** Check for gstreamer ****
if test "x$with_gstreamer" != "xno"
then
-@@ -1688,13 +1713,14 @@
+@@ -1696,13 +1721,14 @@
dnl **** Disable unsupported winmm drivers ****
test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
@@ -210,29 +208,17 @@ diff -uhNr wine-1.5.17/configure.ac wine-1.5.17-mm/configure.ac
then
WINE_WARNING([No sound system was found. Windows applications will be silent.])
fi
-@@ -3026,6 +3052,7 @@
+@@ -3071,6 +3097,7 @@
WINE_CONFIG_DLL(wineoss.drv)
WINE_CONFIG_DLL(wineps.drv,,[install-lib,po])
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)
-diff -uhNr wine-1.5.17/dlls/mmdevapi/main.c wine-1.5.17-mm/dlls/mmdevapi/main.c
---- wine-1.5.17/dlls/mmdevapi/main.c 2012-11-09 19:46:37.000000000 +0100
-+++ wine-1.5.17-mm/dlls/mmdevapi/main.c 2012-11-12 20:02:10.208624523 +0100
-@@ -110,7 +110,7 @@
- {
- static const WCHAR drv_value[] = {'A','u','d','i','o',0};
-
-- static WCHAR default_list[] = {'a','l','s','a',',','o','s','s',',',
-+ static WCHAR default_list[] = {'p','u','l','s','e',',','a','l','s','a',',','o','s','s',',',
- 'c','o','r','e','a','u','d','i','o',0};
-
- DriverFuncs driver;
-diff -uhNr wine-1.5.17/dlls/winepulse.drv/Makefile.in wine-1.5.17-mm/dlls/winepulse.drv/Makefile.in
---- wine-1.5.17/dlls/winepulse.drv/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ wine-1.5.17-mm/dlls/winepulse.drv/Makefile.in 2012-11-12 19:24:06.933539037 +0100
+ WINE_CONFIG_DLL(wing.dll16,enable_win16)
+diff -uhNr wine-1.5.20/dlls/winepulse.drv/Makefile.in wine-1.5.20-winepulse/dlls/winepulse.drv/Makefile.in
+--- wine-1.5.20/dlls/winepulse.drv/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ wine-1.5.20-winepulse/dlls/winepulse.drv/Makefile.in 2012-12-29 08:53:11.106438282 +0100
@@ -0,0 +1,9 @@
+MODULE = winepulse.drv
+IMPORTS = dxguid uuid winmm user32 advapi32 ole32
@@ -243,10 +229,10 @@ diff -uhNr wine-1.5.17/dlls/winepulse.drv/Makefile.in wine-1.5.17-mm/dlls/winepu
+ mmdevdrv.c
+
+ at MAKE_DLL_RULES@
-diff -uhNr wine-1.5.17/dlls/winepulse.drv/mmdevdrv.c wine-1.5.17-mm/dlls/winepulse.drv/mmdevdrv.c
---- wine-1.5.17/dlls/winepulse.drv/mmdevdrv.c 1970-01-01 01:00:00.000000000 +0100
-+++ wine-1.5.17-mm/dlls/winepulse.drv/mmdevdrv.c 2012-11-12 19:24:06.933539037 +0100
-@@ -0,0 +1,3102 @@
+diff -uhNr wine-1.5.20/dlls/winepulse.drv/mmdevdrv.c wine-1.5.20-winepulse/dlls/winepulse.drv/mmdevdrv.c
+--- wine-1.5.20/dlls/winepulse.drv/mmdevdrv.c 1970-01-01 01:00:00.000000000 +0100
++++ wine-1.5.20-winepulse/dlls/winepulse.drv/mmdevdrv.c 2012-12-29 08:53:11.107438210 +0100
+@@ -0,0 +1,3171 @@
+/*
+ * Copyright 2011-2012 Maarten Lankhorst
+ * Copyright 2010-2011 Maarten Lankhorst for CodeWeavers
@@ -780,7 +766,10 @@ diff -uhNr wine-1.5.17/dlls/winepulse.drv/mmdevdrv.c wine-1.5.17-mm/dlls/winepul
+ else
+ This->pad = 0;
+
-+ assert(oldpad >= This->pad);
++ if (oldpad == This->pad)
++ return;
++
++ assert(oldpad > This->pad);
+
+ This->clock_written += oldpad - This->pad;
+ TRACE("New pad: %zu (-%zu)\n", This->pad / pa_frame_size(&This->ss), (oldpad - This->pad) / pa_frame_size(&This->ss));
@@ -1353,10 +1342,8 @@ diff -uhNr wine-1.5.17/dlls/winepulse.drv/mmdevdrv.c wine-1.5.17-mm/dlls/winepul
+ }
+ }
+ This->map.channels = fmt->nChannels;
-+ if (!mask || mask == SPEAKER_ALL)
++ if (!mask || (mask & (SPEAKER_ALL|SPEAKER_RESERVED)))
+ mask = get_channel_mask(fmt->nChannels);
-+ else if (mask == ~0U && fmt->nChannels == 1)
-+ mask = SPEAKER_FRONT_CENTER;
+ for (j = 0; j < sizeof(pulse_pos_from_wfx)/sizeof(*pulse_pos_from_wfx) && i < fmt->nChannels; ++j) {
+ if (mask & (1 << j))
+ This->map.map[i++] = pulse_pos_from_wfx[j];
@@ -1630,83 +1617,147 @@ diff -uhNr wine-1.5.17/dlls/winepulse.drv/mmdevdrv.c wine-1.5.17-mm/dlls/winepul
+ ACImpl *This = impl_from_IAudioClient(iface);
+ HRESULT hr = S_OK;
+ WAVEFORMATEX *closest = NULL;
++ BOOL exclusive;
+
+ TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out);
+
-+ if (!fmt || (mode == AUDCLNT_SHAREMODE_SHARED && !out))
++ if (!fmt)
+ return E_POINTER;
+
+ if (out)
+ *out = NULL;
-+ if (mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE)
++
++ if (mode == AUDCLNT_SHAREMODE_EXCLUSIVE) {
++ exclusive = 1;
++ out = NULL;
++ } else if (mode == AUDCLNT_SHAREMODE_SHARED) {
++ exclusive = 0;
++ if (!out)
++ return E_POINTER;
++ } else
+ return E_INVALIDARG;
-+ if (mode == AUDCLNT_SHAREMODE_EXCLUSIVE)
-+ return This->dataflow == eCapture ? AUDCLNT_E_UNSUPPORTED_FORMAT : AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED;
-+ switch (fmt->wFormatTag) {
-+ case WAVE_FORMAT_EXTENSIBLE:
-+ if (fmt->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX))
-+ return E_INVALIDARG;
-+ dump_fmt(fmt);
-+ break;
-+ case WAVE_FORMAT_ALAW:
-+ case WAVE_FORMAT_MULAW:
-+ case WAVE_FORMAT_IEEE_FLOAT:
-+ case WAVE_FORMAT_PCM:
-+ dump_fmt(fmt);
-+ break;
-+ default:
-+ dump_fmt(fmt);
-+ return AUDCLNT_E_UNSUPPORTED_FORMAT;
-+ }
++
+ if (fmt->nChannels == 0)
+ return AUDCLNT_E_UNSUPPORTED_FORMAT;
++
+ closest = clone_format(fmt);
-+ if (!closest) {
-+ if (out)
-+ *out = NULL;
++ if (!closest)
+ return E_OUTOFMEMORY;
-+ }
+
-+ if (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) {
-+ UINT32 mask = 0, i, channels = 0;
++ dump_fmt(fmt);
++
++ switch (fmt->wFormatTag) {
++ case WAVE_FORMAT_EXTENSIBLE: {
+ WAVEFORMATEXTENSIBLE *ext = (WAVEFORMATEXTENSIBLE*)closest;
+
-+ if ((fmt->nChannels > 1 && ext->dwChannelMask == SPEAKER_ALL) ||
-+ (fmt->nChannels == 1 && ext->dwChannelMask == ~0U)) {
-+ mask = ext->dwChannelMask;
-+ channels = fmt->nChannels;
-+ } else if (ext->dwChannelMask) {
-+ for (i = 1; !(i & SPEAKER_RESERVED); i <<= 1) {
-+ if (i & ext->dwChannelMask) {
-+ mask |= i;
-+ channels++;
++ if ((fmt->cbSize != sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX) &&
++ fmt->cbSize != sizeof(WAVEFORMATEXTENSIBLE)) ||
++ fmt->nBlockAlign != fmt->wBitsPerSample / 8 * fmt->nChannels ||
++ ext->Samples.wValidBitsPerSample > fmt->wBitsPerSample ||
++ fmt->nAvgBytesPerSec != fmt->nBlockAlign * fmt->nSamplesPerSec) {
++ hr = E_INVALIDARG;
++ break;
++ }
++
++ if (exclusive) {
++ UINT32 mask = 0, i, channels = 0;
++
++ if (!(ext->dwChannelMask & (SPEAKER_ALL | SPEAKER_RESERVED))) {
++ for (i = 1; !(i & SPEAKER_RESERVED); i <<= 1) {
++ if (i & ext->dwChannelMask) {
++ mask |= i;
++ channels++;
++ }
++ }
++
++ if (channels != fmt->nChannels || (ext->dwChannelMask & ~mask)) {
++ hr = AUDCLNT_E_UNSUPPORTED_FORMAT;
++ break;
+ }
++ } else {
++ hr = AUDCLNT_E_UNSUPPORTED_FORMAT;
++ break;
+ }
-+ if (channels < fmt->nChannels)
-+ mask = get_channel_mask(fmt->nChannels);
-+ } else
-+ mask = ext->dwChannelMask;
-+ if (ext->dwChannelMask != mask) {
-+ ext->dwChannelMask = mask;
-+ hr = S_FALSE;
+ }
++
++ if (IsEqualGUID(&ext->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) {
++ if (fmt->wBitsPerSample != 32) {
++ hr = E_INVALIDARG;
++ break;
++ }
++
++ if (ext->Samples.wValidBitsPerSample != fmt->wBitsPerSample) {
++ hr = S_FALSE;
++ ext->Samples.wValidBitsPerSample = fmt->wBitsPerSample;
++ }
++ } else if (IsEqualGUID(&ext->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) {
++ if (!fmt->wBitsPerSample || fmt->wBitsPerSample > 32 || fmt->wBitsPerSample % 8) {
++ hr = E_INVALIDARG;
++ break;
++ }
++
++ if (ext->Samples.wValidBitsPerSample != fmt->wBitsPerSample &&
++ !(fmt->wBitsPerSample == 32 &&
++ ext->Samples.wValidBitsPerSample == 24)) {
++ hr = S_FALSE;
++ ext->Samples.wValidBitsPerSample = fmt->wBitsPerSample;
++ break;
++ }
++ } else {
++ hr = AUDCLNT_E_UNSUPPORTED_FORMAT;
++ break;
++ }
++
++ break;
+ }
+
-+ if (fmt->nBlockAlign != fmt->nChannels * fmt->wBitsPerSample / 8 ||
-+ fmt->nAvgBytesPerSec != fmt->nBlockAlign * fmt->nSamplesPerSec)
-+ hr = S_FALSE;
++ case WAVE_FORMAT_ALAW:
++ case WAVE_FORMAT_MULAW:
++ if (fmt->wBitsPerSample != 8) {
++ hr = E_INVALIDARG;
++ break;
++ }
++ /* Fall-through */
++ case WAVE_FORMAT_IEEE_FLOAT:
++ if (fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT && fmt->wBitsPerSample != 32) {
++ hr = E_INVALIDARG;
++ break;
++ }
++ /* Fall-through */
++ case WAVE_FORMAT_PCM:
++ if (fmt->wFormatTag == WAVE_FORMAT_PCM &&
++ (!fmt->wBitsPerSample || fmt->wBitsPerSample > 32 || fmt->wBitsPerSample % 8)) {
++ hr = E_INVALIDARG;
++ break;
++ }
++
++ if (fmt->nChannels > 2) {
++ hr = AUDCLNT_E_UNSUPPORTED_FORMAT;
++ break;
++ }
++ /*
++ * fmt->cbSize, fmt->nBlockAlign and fmt->nAvgBytesPerSec seem to be
++ * ignored, invalid values are happily accepted.
++ */
++ break;
++ default:
++ hr = AUDCLNT_E_UNSUPPORTED_FORMAT;
++ break;
++ }
+
-+ if (hr == S_OK || !out) {
++ if (exclusive && hr != S_OK) {
++ hr = AUDCLNT_E_UNSUPPORTED_FORMAT;
++ CoTaskMemFree(closest);
++ } else if (hr != S_FALSE)
+ CoTaskMemFree(closest);
-+ if (out)
-+ *out = NULL;
-+ } else if (closest) {
-+ closest->nBlockAlign =
-+ closest->nChannels * closest->wBitsPerSample / 8;
-+ closest->nAvgBytesPerSec =
-+ closest->nBlockAlign * closest->nSamplesPerSec;
++ else
+ *out = closest;
-+ }
++
++ /* Winepulse does not currently support exclusive mode, if you know of an
++ * application that uses it, I will correct this..
++ */
++ if (hr == S_OK && exclusive)
++ return This->dataflow == eCapture ? AUDCLNT_E_UNSUPPORTED_FORMAT : AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED;
+
+ TRACE("returning: %08x %p\n", hr, out ? *out : NULL);
+ return hr;
@@ -2070,6 +2121,10 @@ diff -uhNr wine-1.5.17/dlls/winepulse.drv/mmdevdrv.c wine-1.5.17-mm/dlls/winepul
+ return hr;
+}
+
++static void pulse_free_noop(void *buf)
++{
++}
++
+static HRESULT WINAPI AudioRenderClient_ReleaseBuffer(
+ IAudioRenderClient *iface, UINT32 written_frames, DWORD flags)
+{
@@ -2105,7 +2160,7 @@ diff -uhNr wine-1.5.17/dlls/winepulse.drv/mmdevdrv.c wine-1.5.17-mm/dlls/winepul
+ if (This->locked_ptr)
+ pa_stream_write(This->stream, This->locked_ptr, written_bytes, NULL, 0, PA_SEEK_RELATIVE);
+ else
-+ pa_stream_write(This->stream, This->tmp_buffer, written_bytes, NULL, 0, PA_SEEK_RELATIVE);
++ pa_stream_write(This->stream, This->tmp_buffer, written_bytes, pulse_free_noop, 0, PA_SEEK_RELATIVE);
+ This->pad += written_bytes;
+ This->locked_ptr = NULL;
+ TRACE("Released %u, pad %zu\n", written_frames, This->pad / pa_frame_size(&This->ss));
@@ -3349,9 +3404,9 @@ diff -uhNr wine-1.5.17/dlls/winepulse.drv/mmdevdrv.c wine-1.5.17-mm/dlls/winepul
+ *out = &This->IAudioSessionManager2_iface;
+ return S_OK;
+}
-diff -uhNr wine-1.5.17/dlls/winepulse.drv/winepulse.drv.spec wine-1.5.17-mm/dlls/winepulse.drv/winepulse.drv.spec
---- wine-1.5.17/dlls/winepulse.drv/winepulse.drv.spec 1970-01-01 01:00:00.000000000 +0100
-+++ wine-1.5.17-mm/dlls/winepulse.drv/winepulse.drv.spec 2012-11-12 19:24:06.933539037 +0100
+diff -uhNr wine-1.5.20/dlls/winepulse.drv/winepulse.drv.spec wine-1.5.20-winepulse/dlls/winepulse.drv/winepulse.drv.spec
+--- wine-1.5.20/dlls/winepulse.drv/winepulse.drv.spec 1970-01-01 01:00:00.000000000 +0100
++++ wine-1.5.20-winepulse/dlls/winepulse.drv/winepulse.drv.spec 2012-12-29 08:53:11.107438210 +0100
@@ -0,0 +1,5 @@
+# MMDevAPI driver functions
+@ stdcall -private GetPriority() AUDDRV_GetPriority
diff --git a/wine-pulse-winmm-Load-winealsa-if-winepulse-is-found.patch b/wine-pulse-winmm-Load-winealsa-if-winepulse-is-found.patch
index aba3925..f99c72b 100644
--- a/wine-pulse-winmm-Load-winealsa-if-winepulse-is-found.patch
+++ b/wine-pulse-winmm-Load-winealsa-if-winepulse-is-found.patch
@@ -1,12 +1,12 @@
-From 8045bdbc879ec70776427f744f30476cc2b469a4 Mon Sep 17 00:00:00 2001
+From 8f39a12639ee1d39c8caaf5f2ab72540d281814e Mon Sep 17 00:00:00 2001
From: Maarten Lankhorst <maarten.lankhorst at canonical.com>
-Date: Fri, 26 Oct 2012 19:04:00 +0200
+Date: Sat, 29 Dec 2012 01:02:30 +0100
Subject: [PATCH] winmm: Load winealsa if winepulse is found
Fixes midi on winepulse
---
- dlls/winmm/lolvldrv.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ dlls/winmm/lolvldrv.c | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c
index f387323..3b1be27 100644
@@ -25,5 +25,5 @@ index f387323..3b1be27 100644
HeapFree(GetProcessHeap(), 0, drvA);
PropVariantClear(&pv);
--
-1.7.11.7
+1.6.5.GIT
diff --git a/wine.spec b/wine.spec
index 58dd3e2..97afb19 100644
--- a/wine.spec
+++ b/wine.spec
@@ -3,7 +3,7 @@
%global winemono 0.0.8
Name: wine
-Version: 1.5.18
+Version: 1.5.20
Release: 1%{?dist}
Summary: A compatibility layer for windows applications
@@ -56,9 +56,10 @@ Patch511: wine-cjk.patch
## winepulse backend
# http://repo.or.cz/w/wine/multimedia.git
-# last change Mon, 12 Nov 2012 16:25:41 +0000
-Patch1001: wine-pulse-1.5.17.patch
+# Sat, 29 Dec 2012 00:02:38 +0000
+Patch1001: wine-pulse-1.5.20.patch
# use winealsa for midi in the pa backend
+# http://repo.or.cz/w/wine/multimedia.git/commit/8f39a12639ee1d39c8caaf5f2ab72540d281814e
Patch1002: wine-pulse-winmm-Load-winealsa-if-winepulse-is-found.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -893,6 +894,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%dir %{_libdir}/wine
%dir %{_libdir}/wine/fakedlls
%{_libdir}/wine/fakedlls/*
+
%{_libdir}/wine/attrib.exe.so
%{_libdir}/wine/aspnet_regiis.exe.so
%{_libdir}/wine/cacls.exe.so
@@ -932,7 +934,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/wine/winedevice.exe.so
%{_libdir}/wine/wscript.exe.so
%{_libdir}/wine/uninstaller.exe.so
+
%{_libdir}/libwine.so.1*
+
%{_libdir}/wine/acledit.dll.so
%{_libdir}/wine/aclui.dll.so
%{_libdir}/wine/activeds.dll.so
@@ -940,6 +944,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/wine/advapi32.dll.so
%{_libdir}/wine/advpack.dll.so
%{_libdir}/wine/amstream.dll.so
+%{_libdir}/wine/api-ms-win-core-winrt-error-l1-1-0.dll.so
+%{_libdir}/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so
+%{_libdir}/wine/api-ms-win-downlevel-advapi32-l1-1-0.dll.so
+%{_libdir}/wine/api-ms-win-downlevel-advapi32-l2-1-0.dll.so
+%{_libdir}/wine/api-ms-win-downlevel-normaliz-l1-1-0.dll.so
+%{_libdir}/wine/api-ms-win-downlevel-ole32-l1-1-0.dll.so
+%{_libdir}/wine/api-ms-win-downlevel-shell32-l1-1-0.dll.so
+%{_libdir}/wine/api-ms-win-downlevel-shlwapi-l1-1-0.dll.so
+%{_libdir}/wine/api-ms-win-downlevel-shlwapi-l2-1-0.dll.so
+%{_libdir}/wine/api-ms-win-downlevel-user32-l1-1-0.dll.so
+%{_libdir}/wine/api-ms-win-downlevel-version-l1-1-0.dll.so
%{_libdir}/wine/apphelp.dll.so
%{_libdir}/wine/appwiz.cpl.so
%{_libdir}/wine/atl.dll.so
@@ -971,6 +986,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/wine/ctl3d32.dll.so
%{_libdir}/wine/d3d10.dll.so
%{_libdir}/wine/d3d10core.dll.so
+%{_libdir}/wine/d3d11.dll.so
%{_libdir}/wine/d3dcompiler_*.dll.so
%{_libdir}/wine/d3dim.dll.so
%{_libdir}/wine/d3drm.dll.so
@@ -1527,6 +1543,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%changelog
+* Fri Dec 28 2012 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.5.20-1
+- version upgrade
+- upgraded winepulse
+
+* Sun Dec 09 2012 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.5.19-1
+- version upgrade
+- upgraded winepulse
+
* Fri Nov 23 2012 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 1.5.18-1
- version upgrade
More information about the scm-commits
mailing list