mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-17 03:25:46 +00:00
Code Issues Releases Activity

Update to the 2003.03.18 snapshot of Wine. Most of patch-dlls-ntdll-cdrom.c

Browse Source 
has been integrated upstream.
This commit is contained in:
Gerald Pfeifer 2003-03-24 09:06:27 +00:00
parent d2ccc63e26
commit c7240d01b5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=77364
6 changed files with 4 additions and 60 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.02.19
PORTVERSION= 2003.03.18
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/wine/development

2
emulators/wine-devel/distinfo
View File

@ -1 +1 @@
MD5 (Wine-20030219.tar.gz) = 8ba1ee5b2852c8e28333e7e6df115d06
MD5 (Wine-20030318.tar.gz) = a4d1596fb27a9f1530c979250a4a48cd

28
emulators/wine-devel/files/patch-dlls-ntdll-cdrom.c
View File

@ -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;

2
emulators/wine/Makefile
View File

@ -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

2
emulators/wine/distinfo
View File

@ -1 +1 @@
MD5 (Wine-20030219.tar.gz) = 8ba1ee5b2852c8e28333e7e6df115d06
MD5 (Wine-20030318.tar.gz) = a4d1596fb27a9f1530c979250a4a48cd

28
emulators/wine/files/patch-dlls-ntdll-cdrom.c
View File

@ -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;