diff options
| author | gerald <gerald@FreeBSD.org> | 2003-12-28 21:16:21 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2003-12-28 21:16:21 +0800 |
| commit | e281d5a4696884312261365e3489621d760b7aa0 (patch) | |
| tree | 41a4d642a62c040ffdf7daf33e6626c96acd6ae5 /emulators | |
| parent | 6352074c5aa6ae00efd1ae33459b732903b3b0d6 (diff) | |
| download | freebsd-ports-gnome-e281d5a4696884312261365e3489621d760b7aa0.tar.gz freebsd-ports-gnome-e281d5a4696884312261365e3489621d760b7aa0.tar.zst freebsd-ports-gnome-e281d5a4696884312261365e3489621d760b7aa0.zip | |
Get sound working by ignoring errors from our dummy SOUND_MIXER_INFO ioctl.
Bump PORTREVISION.
Reported by: Travis Poppe <tlp@LiquidX.org>
Tested by: Travis Poppe <tlp@LiquidX.org>
Discussed with: matk
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/wine-devel/Makefile | 2 | ||||
| -rw-r--r-- | emulators/wine-devel/files/patch-dlls::winmm::wineoss::audio.c | 24 | ||||
| -rw-r--r-- | emulators/wine/Makefile | 2 | ||||
| -rw-r--r-- | emulators/wine/files/patch-dlls::winmm::wineoss::audio.c | 24 |
4 files changed, 50 insertions, 2 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 7396a93218f0..5088eab14e8f 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -8,7 +8,7 @@ PORTNAME= wine PORTVERSION= 20031212 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/wine/development diff --git a/emulators/wine-devel/files/patch-dlls::winmm::wineoss::audio.c b/emulators/wine-devel/files/patch-dlls::winmm::wineoss::audio.c new file mode 100644 index 000000000000..cb6a286c8700 --- /dev/null +++ b/emulators/wine-devel/files/patch-dlls::winmm::wineoss::audio.c @@ -0,0 +1,24 @@ +Index: dlls/winmm/wineoss/audio.c +=================================================================== +RCS file: /home/wine/wine/dlls/winmm/wineoss/audio.c,v +retrieving revision 1.108 +diff -u -3 -p -r1.108 audio.c +--- dlls/winmm/wineoss/audio.c 12 Dec 2003 05:55:26 -0000 1.108 ++++ dlls/winmm/wineoss/audio.c 28 Dec 2003 12:46:50 -0000 +@@ -544,10 +544,15 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* + strncpy(ossdev->out_caps.szPname, info.name, sizeof(info.name)); + TRACE("%s\n", ossdev->ds_desc.szDesc); + } else { +- ERR("%s: can't read info!\n", ossdev->mixer_name); ++ ERR("%s: cannot read SOUND_MIXER_INFO!\n", ossdev->mixer_name); ++#ifndef __FreeBSD__ ++ /* FreeBSD up to at least 5.2 provides this ioctl, but does ++ * implement it properly, so ignore errors on that platform. ++ */ + OSS_CloseDevice(ossdev); + close(mixer); + return FALSE; ++#endif + } + } else { + ERR("%s: %s\n", ossdev->mixer_name , strerror( errno )); diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 7396a93218f0..5088eab14e8f 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -8,7 +8,7 @@ PORTNAME= wine PORTVERSION= 20031212 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/wine/development diff --git a/emulators/wine/files/patch-dlls::winmm::wineoss::audio.c b/emulators/wine/files/patch-dlls::winmm::wineoss::audio.c new file mode 100644 index 000000000000..cb6a286c8700 --- /dev/null +++ b/emulators/wine/files/patch-dlls::winmm::wineoss::audio.c @@ -0,0 +1,24 @@ +Index: dlls/winmm/wineoss/audio.c +=================================================================== +RCS file: /home/wine/wine/dlls/winmm/wineoss/audio.c,v +retrieving revision 1.108 +diff -u -3 -p -r1.108 audio.c +--- dlls/winmm/wineoss/audio.c 12 Dec 2003 05:55:26 -0000 1.108 ++++ dlls/winmm/wineoss/audio.c 28 Dec 2003 12:46:50 -0000 +@@ -544,10 +544,15 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* + strncpy(ossdev->out_caps.szPname, info.name, sizeof(info.name)); + TRACE("%s\n", ossdev->ds_desc.szDesc); + } else { +- ERR("%s: can't read info!\n", ossdev->mixer_name); ++ ERR("%s: cannot read SOUND_MIXER_INFO!\n", ossdev->mixer_name); ++#ifndef __FreeBSD__ ++ /* FreeBSD up to at least 5.2 provides this ioctl, but does ++ * implement it properly, so ignore errors on that platform. ++ */ + OSS_CloseDevice(ossdev); + close(mixer); + return FALSE; ++#endif + } + } else { + ERR("%s: %s\n", ossdev->mixer_name , strerror( errno )); |