sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to Wine 1.3.20. This includes the following changes:

Browse source 
- Option to clip the mouse inside fullscreen windows.
 - Support for persistent HTTP connections.
 - Initial implementation of the XML writer.
 - Support for drawing rectangles in the DIB engine.
 - Volume control in MMDevAPI.
 - More MSVC runtime functions.
 - Various bug fixes.

Two of my three changes for OSS support have been integrated upstream,
only one remains.

Only tentatively remove $DATADIR/wine upon deinstallation to allow for
the forthcoming wine-gecko port. [1]

PR:		156001 [1]
Submitted by:	David Naylor <naylor.b.david@gmail.com> [1]
This commit is contained in:
Gerald Pfeifer 2011-05-14 00:21:47 +00:00
parent 6727592b3c
commit d2d88b00e8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=274078
8 changed files with 40 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
emulators/wine-devel/Makefile
View file

@ -7,7 +7,7 @@
#
PORTNAME= wine
DISTVERSION= 1.3.19
DISTVERSION= 1.3.20
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \

4
emulators/wine-devel/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (wine-1.3.19.tar.bz2) = 8686777c08d76be742f089a292cb5f7b339d7d4cc6ca8161c97d97dec9e4e78d
SIZE (wine-1.3.19.tar.bz2) = 19185499
SHA256 (wine-1.3.20.tar.bz2) = 39f55232973536158d4545c7f389648d64d34bc4be2b640086fdf3e6507db71e
SIZE (wine-1.3.20.tar.bz2) = 19251527

56
emulators/wine-devel/files/patch-dlls-wineoss.drv
View file

@ -1,54 +1,18 @@
diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index ff21cd6..76fd474 100644
index 7dec1e0..0edcb25 100644
--- dlls/wineoss.drv/mmdevdrv.c
+++ dlls/wineoss.drv/mmdevdrv.c
@@ -500,7 +500,7 @@ static int get_oss_format(const WAVEFORMATEX *fmt)
case 16:
return AFMT_S16_LE;
case 24:
- return AFMT_S24_PACKED;
+ return AFMT_S24_LE;
case 32:
return AFMT_S32_LE;
}
@@ -513,7 +513,9 @@ static int get_oss_format(const WAVEFORMATEX *fmt)
if(fmt->wBitsPerSample != 32)
return -1;
+#ifdef AFMT_FLOAT
return AFMT_FLOAT;
+#endif
}
return -1;
@@ -944,16 +946,18 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface,
if(formats & AFMT_S16_LE){
fmt->Format.wBitsPerSample = 16;
fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
+#ifdef AFMT_FLOAT
}else if(formats & AFMT_FLOAT){
fmt->Format.wBitsPerSample = 32;
fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
+#endif
}else if(formats & AFMT_U8){
fmt->Format.wBitsPerSample = 8;
fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
}else if(formats & AFMT_S32_LE){
fmt->Format.wBitsPerSample = 32;
fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
- }else if(formats & AFMT_S24_PACKED){
+ }else if(formats & AFMT_S24_LE){
fmt->Format.wBitsPerSample = 24;
fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
}else{
@@ -1174,6 +1178,10 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface)
This->timer = NULL;
}
@@ -53,6 +53,13 @@
#include "audiopolicy.h"
#include "audioclient.h"
+
+/* Some implementations of OSS, such as FreeBSD older than 9.0, lack
+ SNDCTL_DSP_HALT which is just a synonym for the older SNDCTL_DSP_RESET. */
+#ifndef SNDCTL_DSP_HALT
+#define SNDCTL_DSP_HALT SNDCTL_DSP_RESET
+#endif
+
if(ioctl(This->fd, SNDCTL_DSP_HALT, NULL) < 0){
LeaveCriticalSection(&This->lock);
WARN("HALT failed: %d (%s)\n", errno, strerror(errno));
WINE_DEFAULT_DEBUG_CHANNEL(oss);
#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)

8
emulators/wine-devel/pkg-plist
View file

@ -491,6 +491,8 @@ include/wine/windows/richedit.h
include/wine/windows/richole.h
include/wine/windows/richole.idl
include/wine/windows/rmxfguid.h
include/wine/windows/rmxftmpl.h
include/wine/windows/rmxftmpl.x
include/wine/windows/row.idl
include/wine/windows/rowchg.idl
include/wine/windows/rpc.h
@ -1044,6 +1046,8 @@ lib/wine/fakedlls/mstask.dll
lib/wine/fakedlls/msvcirt.dll
lib/wine/fakedlls/msvcp100.dll
lib/wine/fakedlls/msvcp60.dll
lib/wine/fakedlls/msvcp70.dll
lib/wine/fakedlls/msvcp71.dll
lib/wine/fakedlls/msvcp80.dll
lib/wine/fakedlls/msvcp90.dll
lib/wine/fakedlls/msvcr100.dll
@ -1530,6 +1534,8 @@ lib/wine/mstask.dll.so
lib/wine/msvcirt.dll.so
lib/wine/msvcp100.dll.so
lib/wine/msvcp60.dll.so
lib/wine/msvcp70.dll.so
lib/wine/msvcp71.dll.so
lib/wine/msvcp80.dll.so
lib/wine/msvcp90.dll.so
lib/wine/msvcr100.dll.so
@ -1812,7 +1818,7 @@ share/applications/wine.desktop
%%PORTDOCS%%%%DOCSDIR%%/README.winedump
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/wine/fonts
@dirrm %%DATADIR%%/wine
@dirrmtry %%DATADIR%%/wine
@dirrmtry %%DATADIR%%/aclocal
@dirrmtry %%DATADIR%%
@dirrmtry share/applications

2
emulators/wine/Makefile
View file

@ -7,7 +7,7 @@
#
PORTNAME= wine
DISTVERSION= 1.3.19
DISTVERSION= 1.3.20
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \

4
emulators/wine/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (wine-1.3.19.tar.bz2) = 8686777c08d76be742f089a292cb5f7b339d7d4cc6ca8161c97d97dec9e4e78d
SIZE (wine-1.3.19.tar.bz2) = 19185499
SHA256 (wine-1.3.20.tar.bz2) = 39f55232973536158d4545c7f389648d64d34bc4be2b640086fdf3e6507db71e
SIZE (wine-1.3.20.tar.bz2) = 19251527

56
emulators/wine/files/patch-dlls-wineoss.drv
View file

@ -1,54 +1,18 @@
diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index ff21cd6..76fd474 100644
index 7dec1e0..0edcb25 100644
--- dlls/wineoss.drv/mmdevdrv.c
+++ dlls/wineoss.drv/mmdevdrv.c
@@ -500,7 +500,7 @@ static int get_oss_format(const WAVEFORMATEX *fmt)
case 16:
return AFMT_S16_LE;
case 24:
- return AFMT_S24_PACKED;
+ return AFMT_S24_LE;
case 32:
return AFMT_S32_LE;
}
@@ -513,7 +513,9 @@ static int get_oss_format(const WAVEFORMATEX *fmt)
if(fmt->wBitsPerSample != 32)
return -1;
+#ifdef AFMT_FLOAT
return AFMT_FLOAT;
+#endif
}
return -1;
@@ -944,16 +946,18 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface,
if(formats & AFMT_S16_LE){
fmt->Format.wBitsPerSample = 16;
fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
+#ifdef AFMT_FLOAT
}else if(formats & AFMT_FLOAT){
fmt->Format.wBitsPerSample = 32;
fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
+#endif
}else if(formats & AFMT_U8){
fmt->Format.wBitsPerSample = 8;
fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
}else if(formats & AFMT_S32_LE){
fmt->Format.wBitsPerSample = 32;
fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
- }else if(formats & AFMT_S24_PACKED){
+ }else if(formats & AFMT_S24_LE){
fmt->Format.wBitsPerSample = 24;
fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
}else{
@@ -1174,6 +1178,10 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface)
This->timer = NULL;
}
@@ -53,6 +53,13 @@
#include "audiopolicy.h"
#include "audioclient.h"
+
+/* Some implementations of OSS, such as FreeBSD older than 9.0, lack
+ SNDCTL_DSP_HALT which is just a synonym for the older SNDCTL_DSP_RESET. */
+#ifndef SNDCTL_DSP_HALT
+#define SNDCTL_DSP_HALT SNDCTL_DSP_RESET
+#endif
+
if(ioctl(This->fd, SNDCTL_DSP_HALT, NULL) < 0){
LeaveCriticalSection(&This->lock);
WARN("HALT failed: %d (%s)\n", errno, strerror(errno));
WINE_DEFAULT_DEBUG_CHANNEL(oss);
#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)

8
emulators/wine/pkg-plist
View file

@ -491,6 +491,8 @@ include/wine/windows/richedit.h
include/wine/windows/richole.h
include/wine/windows/richole.idl
include/wine/windows/rmxfguid.h
include/wine/windows/rmxftmpl.h
include/wine/windows/rmxftmpl.x
include/wine/windows/row.idl
include/wine/windows/rowchg.idl
include/wine/windows/rpc.h
@ -1044,6 +1046,8 @@ lib/wine/fakedlls/mstask.dll
lib/wine/fakedlls/msvcirt.dll
lib/wine/fakedlls/msvcp100.dll
lib/wine/fakedlls/msvcp60.dll
lib/wine/fakedlls/msvcp70.dll
lib/wine/fakedlls/msvcp71.dll
lib/wine/fakedlls/msvcp80.dll
lib/wine/fakedlls/msvcp90.dll
lib/wine/fakedlls/msvcr100.dll
@ -1530,6 +1534,8 @@ lib/wine/mstask.dll.so
lib/wine/msvcirt.dll.so
lib/wine/msvcp100.dll.so
lib/wine/msvcp60.dll.so
lib/wine/msvcp70.dll.so
lib/wine/msvcp71.dll.so
lib/wine/msvcp80.dll.so
lib/wine/msvcp90.dll.so
lib/wine/msvcr100.dll.so
@ -1812,7 +1818,7 @@ share/applications/wine.desktop
%%PORTDOCS%%%%DOCSDIR%%/README.winedump
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/wine/fonts
@dirrm %%DATADIR%%/wine
@dirrmtry %%DATADIR%%/wine
@dirrmtry %%DATADIR%%/aclocal
@dirrmtry %%DATADIR%%
@dirrmtry share/applications