diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2002-10-30 17:56:30 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2002-10-30 17:56:30 +0000 |
| commit | 4e6c4e676d995e54ce0dedc74ce0a7dfabbb3312 (patch) | |
| tree | f1f9d9edb93a323119779d98139673406284e611 | |
| parent | Disable cups in configure when not wanting cups (diff) | |
Add a patch from the upstream sources to improve this port until the next
Wine snapshot.
Submitted by: Ulrich 'Q' Spoerlein <q@galgenberg.net>
Approved by: obrien (mentor)
Notes
Notes:
svn path=/head/; revision=69170
| -rw-r--r-- | emulators/wine-devel/files/patch-upstream | 20 | ||||
| -rw-r--r-- | emulators/wine/files/patch-upstream | 20 |
2 files changed, 40 insertions, 0 deletions
diff --git a/emulators/wine-devel/files/patch-upstream b/emulators/wine-devel/files/patch-upstream new file mode 100644 index 000000000000..dd8268d4b877 --- /dev/null +++ b/emulators/wine-devel/files/patch-upstream @@ -0,0 +1,20 @@ +--- dlls/winmm/wineoss/audio.c:1.62 Wed Oct 30 08:38:42 2002 ++++ dlls/winmm/wineoss/audio.c Wed Oct 30 08:38:42 2002 +@@ -245,7 +245,7 @@ + if ((fd = open(ossdev->dev_name, ossdev->open_access|O_NDELAY, 0)) == -1) + { + WARN("Couldn't open out %s (%s)\n", ossdev->dev_name, strerror(errno)); +- return (errno == EBUSY) ? MMSYSERR_ALLOCATED : MMSYSERR_ERROR; ++ return -1; + } + fcntl(fd, F_SETFD, 1); /* set close on exec flag */ + /* turn full duplex on if it has been requested */ +@@ -373,7 +373,7 @@ + } + TRACE("Changing fd from %d to ", ossdev->fd); + close(ossdev->fd); +- OSS_RawOpenDevice(ossdev, &ossdev->audio_fragment); ++ ossdev->fd = OSS_RawOpenDevice(ossdev, &ossdev->audio_fragment); + TRACE("%d\n", ossdev->fd); + return ossdev->fd; + } diff --git a/emulators/wine/files/patch-upstream b/emulators/wine/files/patch-upstream new file mode 100644 index 000000000000..dd8268d4b877 --- /dev/null +++ b/emulators/wine/files/patch-upstream @@ -0,0 +1,20 @@ +--- dlls/winmm/wineoss/audio.c:1.62 Wed Oct 30 08:38:42 2002 ++++ dlls/winmm/wineoss/audio.c Wed Oct 30 08:38:42 2002 +@@ -245,7 +245,7 @@ + if ((fd = open(ossdev->dev_name, ossdev->open_access|O_NDELAY, 0)) == -1) + { + WARN("Couldn't open out %s (%s)\n", ossdev->dev_name, strerror(errno)); +- return (errno == EBUSY) ? MMSYSERR_ALLOCATED : MMSYSERR_ERROR; ++ return -1; + } + fcntl(fd, F_SETFD, 1); /* set close on exec flag */ + /* turn full duplex on if it has been requested */ +@@ -373,7 +373,7 @@ + } + TRACE("Changing fd from %d to ", ossdev->fd); + close(ossdev->fd); +- OSS_RawOpenDevice(ossdev, &ossdev->audio_fragment); ++ ossdev->fd = OSS_RawOpenDevice(ossdev, &ossdev->audio_fragment); + TRACE("%d\n", ossdev->fd); + return ossdev->fd; + } |