diff options
author | jmmv <jmmv@pkgsrc.org> | 2004-06-26 22:12:28 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2004-06-26 22:12:28 +0000 |
commit | b74aaaeab93fa0494015e9ac4336636f84b15223 (patch) | |
tree | dc7ef24000c8fdafa0928b6714e07668c2f289ef /audio | |
parent | dba1c31bfb920406c84e152dfc169ee2849999a6 (diff) | |
download | pkgsrc-b74aaaeab93fa0494015e9ac4336636f84b15223.tar.gz |
Fix the OSS plugin. For me it only fixes the volume control, but I have
been told by many people that it doesn't work at all for them... hopefully
this solves all problems.
The fix is the following: instead of using the included soundcard.h file,
use the one provided by the system (only in the NetBSD case; I can't test
other systems).
Idea from PR pkg/25301 by Kouichirou Hiratsuka. Bump PKGREVISION to 1.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/bmp/Makefile | 4 | ||||
-rw-r--r-- | audio/bmp/Makefile.common | 6 | ||||
-rw-r--r-- | audio/bmp/distinfo | 4 | ||||
-rw-r--r-- | audio/bmp/patches/patch-aq | 13 | ||||
-rw-r--r-- | audio/bmp/patches/patch-ar | 13 |
5 files changed, 37 insertions, 3 deletions
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile index 3ac6436ce27..f50f92ddac7 100644 --- a/audio/bmp/Makefile +++ b/audio/bmp/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2004/04/12 23:15:01 salo Exp $ +# $NetBSD: Makefile,v 1.3 2004/06/26 22:12:28 jmmv Exp $ # .include "Makefile.common" +PKGREVISION= 1 + CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-oss/--enable-oss/} CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-vorbis/--enable-vorbis/} diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common index 17a5652c05d..850706c8154 100644 --- a/audio/bmp/Makefile.common +++ b/audio/bmp/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2004/04/14 16:15:20 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.4 2004/06/26 22:12:28 jmmv Exp $ # DISTNAME= bmp-0.9.6.1 @@ -38,6 +38,10 @@ CONFIGURE_ARGS+= --with-dev-dsp=${DEVOSSSOUND} \ --with-cdda-device=/dev/rcd0${RAWPART} \ --with-cdda-dir=/cdrom/ +post-extract: + ${RM} ${WRKSRC}/Output/OSS/soundcard.h + ${LN} -s /usr/include/soundcard.h ${WRKSRC}/Output/OSS/soundcard.h + . if ${MACHINE_ARCH} == "i386" post-patch: . if ${OBJECT_FMT} == "a.out" diff --git a/audio/bmp/distinfo b/audio/bmp/distinfo index 6b57b898351..c59df796778 100644 --- a/audio/bmp/distinfo +++ b/audio/bmp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2004/05/28 19:20:38 jmmv Exp $ +$NetBSD: distinfo,v 1.6 2004/06/26 22:12:28 jmmv Exp $ SHA1 (bmp-0.9.6.1.tar.gz) = c07b55c7fa3e965ff07bf7794b1ca03d00606197 Size (bmp-0.9.6.1.tar.gz) = 1472078 bytes @@ -16,3 +16,5 @@ SHA1 (patch-am) = b1b15fe6deeee7e9d51ce3cb8739baf9886e3812 SHA1 (patch-an) = da55750c5ee50acfd25e695813bfc025c4fc7b5f SHA1 (patch-ao) = 9043ce4618715ff2cfe12df0d31806a9745c25ed SHA1 (patch-ap) = 76d750aa820e9710d2520d3cec067d91346dc5aa +SHA1 (patch-aq) = 37f42a5bc9eca8568f5b3889580580997c3c6fc1 +SHA1 (patch-ar) = 2d519625a427cd54fa9af376bda80c085b617ea2 diff --git a/audio/bmp/patches/patch-aq b/audio/bmp/patches/patch-aq new file mode 100644 index 00000000000..ade9a857551 --- /dev/null +++ b/audio/bmp/patches/patch-aq @@ -0,0 +1,13 @@ +$NetBSD: patch-aq,v 1.1 2004/06/26 22:12:28 jmmv Exp $ + +--- Output/OSS/Makefile.in.orig 2004-06-26 23:46:20.000000000 +0200 ++++ Output/OSS/Makefile.in +@@ -239,7 +239,7 @@ EXTRA_DIST = $(osssources) + lib_LTLIBRARIES = $(ossltlibs) + + libOSS_la_LDFLAGS = @PLUGIN_LDFLAGS@ +-libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ ++libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ $(LIBOSSAUDIO) + libOSS_la_SOURCES = $(ossbuildsources) + INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir) + subdir = Output/OSS diff --git a/audio/bmp/patches/patch-ar b/audio/bmp/patches/patch-ar new file mode 100644 index 00000000000..a089a2c5056 --- /dev/null +++ b/audio/bmp/patches/patch-ar @@ -0,0 +1,13 @@ +$NetBSD: patch-ar,v 1.1 2004/06/26 22:12:28 jmmv Exp $ + +--- Input/cdaudio/Makefile.in.orig 2004-06-26 23:51:20.000000000 +0200 ++++ Input/cdaudio/Makefile.in +@@ -241,7 +241,7 @@ lib_LTLIBRARIES = $(cdaudioltlibs) + + INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir) + libcdaudio_la_LDFLAGS = @PLUGIN_LDFLAGS@ +-libcdaudio_la_LIBADD = @GTK_LIBS@ ++libcdaudio_la_LIBADD = @GTK_LIBS@ $(LIBOSSAUDIO) + libcdaudio_la_SOURCES = $(cdaudiobuildsources) + subdir = Input/cdaudio + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |