kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to the 2003.02.19 snapshot of Wine.

Browse source 
The portability issue in dlls/dsound/test was fixed, but a Linuxism in
dlls/ntdll/cdrom.c added.  I have submitted files/patch-dlls-ntdll-cdrom.c
upstream as well.

Approved by:	obrien (mentor)
This commit is contained in:
Gerald Pfeifer 2003-02-20 10:23:19 +00:00
parent 7444b52f8d
commit 45ecbd85d9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=75934
10 changed files with 92 additions and 28 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
PORTVERSION= 2003.01.15
PORTVERSION= 2003.02.19
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/wine/development

2
emulators/wine-devel/distinfo
View file

@ -1 +1 @@
MD5 (Wine-20030115.tar.gz) = 31169eae48d2d51e6771fafd1b12f8d2
MD5 (Wine-20030219.tar.gz) = 8ba1ee5b2852c8e28333e7e6df115d06

12
emulators/wine-devel/files/patch-dlls-dsound
View file

@ -1,12 +0,0 @@
--- dlls/dsound/tests/dsound.c 16 Jan 2003 00:19:49 -0000 1.4
+++ dlls/dsound/tests/dsound.c 19 Jan 2003 21:45:43 -0000
@@ -18,8 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <malloc.h>
#include <math.h>
+#include <stdlib.h>
#include "wine/test.h"
#include "dsound.h"

41
emulators/wine-devel/files/patch-dlls-ntdll-cdrom.c Normal file
View file

@ -0,0 +1,41 @@
--- dlls/ntdll/cdrom.c 19 Feb 2003 22:08:50 -0000 1.25
+++ dlls/ntdll/cdrom.c 20 Feb 2003 09:30:31 -0000
@@ -72,6 +72,15 @@
#include "file.h"
#include "wine/debug.h"
+/* Non-Linux systems do not have linux/cdrom.h and the like, and thus
+ lack the following constants. */
+
+#ifndef CD_SECS
+ #define CD_SECS 60 /* seconds per minute */
+#endif
+#ifndef CD_FRAMES
+ #define CD_FRAMES 75 /* frames per second */
+#endif
static const struct iocodexs
{
@@ -285,8 +294,10 @@ static int CDROM_SyncCache(int dev)
+ sizeof(TRACK_DATA) * (toc->LastTrack-toc->FirstTrack+2);
toc->Length[0] = tsz >> 8;
toc->Length[1] = tsz;
-
+
+#ifdef linux
TRACE("caching toc from=%d to=%d\n", hdr.cdth_trk0, hdr.cdth_trk1);
+#endif
for (i = toc->FirstTrack; i <= toc->LastTrack + 1; i++)
{
@@ -1038,7 +1049,9 @@ static DWORD CDROM_SeekAudioMSF(int dev,
if (i <= toc.FirstTrack || i > toc.LastTrack+1)
return STATUS_INVALID_PARAMETER;
i--;
- cp->FormatCode = CDROM_MSF;
+#ifdef CDROM_MSF
+ cp->FormatCode = CDROM_MSF;
+#endif
cp->Control = toc.TrackData[i-toc.FirstTrack].Control;
cp->ADR = toc.TrackData[i-toc.FirstTrack].Adr;
cp->TrackNumber = toc.TrackData[i-toc.FirstTrack].TrackNumber;

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

@ -272,6 +272,7 @@ lib/wine/ctl3d.dll.so
lib/wine/ctl3d32.dll.so
lib/wine/ctl3dv2.dll.so
lib/wine/d3d8.dll.so
lib/wine/d3dim.dll.so
lib/wine/d3dx8.dll.so
lib/wine/dciman32.dll.so
lib/wine/ddeml.dll.so
@ -308,6 +309,7 @@ lib/wine/libcrtdll.def
lib/wine/libcrypt32.def
lib/wine/libctl3d32.def
lib/wine/libd3d8.def
lib/wine/libd3dim.def
lib/wine/libd3dx8.def
lib/wine/libdciman32.def
lib/wine/libddraw.def
@ -451,6 +453,7 @@ lib/wine/shfolder.dll.so
lib/wine/shlwapi.dll.so
lib/wine/snmpapi.dll.so
lib/wine/sound.dll.so
lib/wine/start.exe.so
lib/wine/sti.dll.so
lib/wine/storage.dll.so
lib/wine/stress.dll.so

2
emulators/wine/Makefile
View file

@ -7,7 +7,7 @@
#
PORTNAME= wine
PORTVERSION= 2003.01.15
PORTVERSION= 2003.02.19
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/wine/development

2
emulators/wine/distinfo
View file

@ -1 +1 @@
MD5 (Wine-20030115.tar.gz) = 31169eae48d2d51e6771fafd1b12f8d2
MD5 (Wine-20030219.tar.gz) = 8ba1ee5b2852c8e28333e7e6df115d06

12
emulators/wine/files/patch-dlls-dsound
View file

@ -1,12 +0,0 @@
--- dlls/dsound/tests/dsound.c 16 Jan 2003 00:19:49 -0000 1.4
+++ dlls/dsound/tests/dsound.c 19 Jan 2003 21:45:43 -0000
@@ -18,8 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <malloc.h>
#include <math.h>
+#include <stdlib.h>
#include "wine/test.h"
#include "dsound.h"

41
emulators/wine/files/patch-dlls-ntdll-cdrom.c Normal file
View file

@ -0,0 +1,41 @@
--- dlls/ntdll/cdrom.c 19 Feb 2003 22:08:50 -0000 1.25
+++ dlls/ntdll/cdrom.c 20 Feb 2003 09:30:31 -0000
@@ -72,6 +72,15 @@
#include "file.h"
#include "wine/debug.h"
+/* Non-Linux systems do not have linux/cdrom.h and the like, and thus
+ lack the following constants. */
+
+#ifndef CD_SECS
+ #define CD_SECS 60 /* seconds per minute */
+#endif
+#ifndef CD_FRAMES
+ #define CD_FRAMES 75 /* frames per second */
+#endif
static const struct iocodexs
{
@@ -285,8 +294,10 @@ static int CDROM_SyncCache(int dev)
+ sizeof(TRACK_DATA) * (toc->LastTrack-toc->FirstTrack+2);
toc->Length[0] = tsz >> 8;
toc->Length[1] = tsz;
-
+
+#ifdef linux
TRACE("caching toc from=%d to=%d\n", hdr.cdth_trk0, hdr.cdth_trk1);
+#endif
for (i = toc->FirstTrack; i <= toc->LastTrack + 1; i++)
{
@@ -1038,7 +1049,9 @@ static DWORD CDROM_SeekAudioMSF(int dev,
if (i <= toc.FirstTrack || i > toc.LastTrack+1)
return STATUS_INVALID_PARAMETER;
i--;
- cp->FormatCode = CDROM_MSF;
+#ifdef CDROM_MSF
+ cp->FormatCode = CDROM_MSF;
+#endif
cp->Control = toc.TrackData[i-toc.FirstTrack].Control;
cp->ADR = toc.TrackData[i-toc.FirstTrack].Adr;
cp->TrackNumber = toc.TrackData[i-toc.FirstTrack].TrackNumber;

3
emulators/wine/pkg-plist
View file

@ -272,6 +272,7 @@ lib/wine/ctl3d.dll.so
lib/wine/ctl3d32.dll.so
lib/wine/ctl3dv2.dll.so
lib/wine/d3d8.dll.so
lib/wine/d3dim.dll.so
lib/wine/d3dx8.dll.so
lib/wine/dciman32.dll.so
lib/wine/ddeml.dll.so
@ -308,6 +309,7 @@ lib/wine/libcrtdll.def
lib/wine/libcrypt32.def
lib/wine/libctl3d32.def
lib/wine/libd3d8.def
lib/wine/libd3dim.def
lib/wine/libd3dx8.def
lib/wine/libdciman32.def
lib/wine/libddraw.def
@ -451,6 +453,7 @@ lib/wine/shfolder.dll.so
lib/wine/shlwapi.dll.so
lib/wine/snmpapi.dll.so
lib/wine/sound.dll.so
lib/wine/start.exe.so
lib/wine/sti.dll.so
lib/wine/storage.dll.so
lib/wine/stress.dll.so