diff options
| author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2009-09-21 12:58:05 +0000 |
|---|---|---|
| committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2009-09-21 12:58:05 +0000 |
| commit | e6dcffe7888ae6909815c3d06e96bbb0455825f0 (patch) | |
| tree | e4873851811cccdba34043a48baae54d47c4b437 /audio/ocp | |
| parent | OpenDKIM is an open source implementation of the DKIM sender authentication (diff) | |
Add a patch to prevent the OSS driver detection from failing and bump
PORTREVISION.
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=241871
Diffstat (limited to 'audio/ocp')
| -rw-r--r-- | audio/ocp/Makefile | 2 | ||||
| -rw-r--r-- | audio/ocp/files/extrapatch-config.h.in | 11 | ||||
| -rw-r--r-- | audio/ocp/files/patch-devp__devposs.c | 34 |
3 files changed, 47 insertions, 0 deletions
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile index d617e85242a3..c865128cca8b 100644 --- a/audio/ocp/Makefile +++ b/audio/ocp/Makefile @@ -7,6 +7,7 @@ PORTNAME= ocp PORTVERSION= 0.1.17 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= CRITICAL @@ -74,6 +75,7 @@ PLIST_SUB+= XORG="" .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --with-debug +EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-* .endif .if defined(WITH_ADPLUG) diff --git a/audio/ocp/files/extrapatch-config.h.in b/audio/ocp/files/extrapatch-config.h.in new file mode 100644 index 000000000000..21c6c46ce12d --- /dev/null +++ b/audio/ocp/files/extrapatch-config.h.in @@ -0,0 +1,11 @@ +--- ./config.h.in.orig 2009-06-27 12:15:43.000000000 +0200 ++++ ./config.h.in 2009-09-21 14:22:56.000000000 +0200 +@@ -135,7 +135,7 @@ + /* #define INITCLOSE_DEBUG 1*/ + /* #define LD_DEBUG 1 */ + /* #define TIMER_DEBUG 1 */ +-/* #define OSS_DEBUG 1 */ ++#define OSS_DEBUG 1 + /* #define ALSA_DEBUG 1 */ + /* #define OSS_LOCK_DEBUG 1 */ + /* #define S3M_LOAD_DEBUG 1 */ diff --git a/audio/ocp/files/patch-devp__devposs.c b/audio/ocp/files/patch-devp__devposs.c new file mode 100644 index 000000000000..7ca22fc0a796 --- /dev/null +++ b/audio/ocp/files/patch-devp__devposs.c @@ -0,0 +1,34 @@ +--- ./devp/devposs.c.orig 2009-09-21 14:23:33.000000000 +0200 ++++ ./devp/devposs.c 2009-09-21 14:25:24.000000000 +0200 +@@ -448,6 +448,7 @@ + if (fcntl(fd_dsp, F_SETFD, FD_CLOEXEC)<0) + perror("devposs: fcntl(fd_dsp, F_SETFD, FD_CLOEXEC)"); + #ifdef OSS_DEBUG ++/* + #if defined(OSS_GETVERSION) + if (ioctl(fd_dsp, OSS_GETVERSION, &tmp)<0) + tmp=0; +@@ -458,6 +459,7 @@ + #elif defined(SOUND_VERSION) + fprintf(stderr, "devposs: compiled agains OSS version %d.%d.%d\n", (SOUND_VERSION&0xff0000)>>16, (SOUND_VERSION&0xff00)>>8, SOUND_VERSION&0xff); + #endif ++*/ + #endif + plrSetOptions(plrRate, plrOpt); + +@@ -597,6 +599,7 @@ + return 0; + } + ++/* + #if defined(OSS_GETVERSION) + if (ioctl(fd_dsp, OSS_GETVERSION, &tmp)<0) + { +@@ -607,6 +610,7 @@ + return 0; + } + #endif ++*/ + + #ifdef OSS_DEBUG + fprintf(stderr, "devposs: OSS detected\n"); |