diff options
author | Gerald Pfeifer <gerald@FreeBSD.org> | 2003-03-24 09:06:27 +0000 |
---|---|---|
committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2003-03-24 09:06:27 +0000 |
commit | c7240d01b54edd89b1b737d7554b2219b017c3c3 (patch) | |
tree | 707a75730159d8d95f644c9583aa1999f5a79bc5 /emulators/wine-devel | |
parent | Update 2.2.2 -> 2.2.2a: (diff) |
Update to the 2003.03.18 snapshot of Wine. Most of patch-dlls-ntdll-cdrom.c
has been integrated upstream.
Notes
Notes:
svn path=/head/; revision=77364
Diffstat (limited to 'emulators/wine-devel')
-rw-r--r-- | emulators/wine-devel/Makefile | 2 | ||||
-rw-r--r-- | emulators/wine-devel/distinfo | 2 | ||||
-rw-r--r-- | emulators/wine-devel/files/patch-dlls-ntdll-cdrom.c | 28 |
3 files changed, 2 insertions, 30 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 548f9f2c9acb..f709bd3cd1fa 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -7,7 +7,7 @@ # PORTNAME= wine -PORTVERSION= 2003.02.19 +PORTVERSION= 2003.03.18 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/wine/development diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 671e61b98e9d..1afb93879669 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1 +1 @@ -MD5 (Wine-20030219.tar.gz) = 8ba1ee5b2852c8e28333e7e6df115d06 +MD5 (Wine-20030318.tar.gz) = a4d1596fb27a9f1530c979250a4a48cd diff --git a/emulators/wine-devel/files/patch-dlls-ntdll-cdrom.c b/emulators/wine-devel/files/patch-dlls-ntdll-cdrom.c index 38b8a72c47a7..93f48db51cfe 100644 --- a/emulators/wine-devel/files/patch-dlls-ntdll-cdrom.c +++ b/emulators/wine-devel/files/patch-dlls-ntdll-cdrom.c @@ -1,33 +1,5 @@ --- 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; |