diff options
author | jperkin <jperkin@pkgsrc.org> | 2012-07-24 19:47:43 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2012-07-24 19:47:43 +0000 |
commit | fec8da16d38023e2651b678c48ad9bcf52036a5c (patch) | |
tree | 034004173fd638646962feac37c3ca156c805938 /audio/timidity | |
parent | 6976037fe1f71fef253adbcb82e61a658b01402b (diff) | |
download | pkgsrc-fec8da16d38023e2651b678c48ad9bcf52036a5c.tar.gz |
Apply patches from Yair K. This enables network playback, and fixes the
build on Solaris, perhaps others as well.
Bump PKGREVISION.
Diffstat (limited to 'audio/timidity')
-rw-r--r-- | audio/timidity/Makefile | 4 | ||||
-rw-r--r-- | audio/timidity/distinfo | 3 | ||||
-rw-r--r-- | audio/timidity/options.mk | 9 | ||||
-rw-r--r-- | audio/timidity/patches/patch-timidity_midi_a__c.c | 22 |
4 files changed, 34 insertions, 4 deletions
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile index b057140d488..308b1e95259 100644 --- a/audio/timidity/Makefile +++ b/audio/timidity/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.81 2012/07/08 09:51:31 wiz Exp $ +# $NetBSD: Makefile,v 1.82 2012/07/24 19:47:43 jperkin Exp $ DISTNAME= TiMidity++-2.14.0 PKGNAME= ${DISTNAME:S/TiMidity++/timidity/} +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=timidity/} EXTRACT_SUFX= .tar.bz2 @@ -24,6 +25,7 @@ CONFIGURE_ARGS+= --with-vorbis="${BUILDLINK_DIR}/include" CONFIGURE_ARGS+= --with-libFLAC="${BUILDLINK_DIR}/include" CONFIGURE_ARGS+= --with-default-path=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --enable-audio=${TIMIDITY_NATIVE_AUDIO},ao,vorbis,flac,speex +CONFIGURE_ARGS+= --enable-network .include "../../mk/bsd.prefs.mk" diff --git a/audio/timidity/distinfo b/audio/timidity/distinfo index fb2781a0f16..44a814bddb2 100644 --- a/audio/timidity/distinfo +++ b/audio/timidity/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.16 2012/07/08 09:51:31 wiz Exp $ +$NetBSD: distinfo,v 1.17 2012/07/24 19:47:43 jperkin Exp $ SHA1 (TiMidity++-2.14.0.tar.bz2) = 3d1d18ddf3e52412985af9a49dbe7ad345b478a8 RMD160 (TiMidity++-2.14.0.tar.bz2) = f12d56a1576931f90672304af6dcf8d653151b8a Size (TiMidity++-2.14.0.tar.bz2) = 1611424 bytes SHA1 (patch-ac) = 7e7d849bba481a2374eb830da9010f633a2aed29 SHA1 (patch-interface_server__c.c) = 5a37bcb4a6aaa93fd80ab210ba64a2a1a5d04480 +SHA1 (patch-timidity_midi_a__c.c) = 171bcd9ddd54487ce3cffa9a6966afb96c00671c diff --git a/audio/timidity/options.mk b/audio/timidity/options.mk index ce061fb3f8e..96803a9d503 100644 --- a/audio/timidity/options.mk +++ b/audio/timidity/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2012/07/08 09:52:05 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2012/07/24 19:47:43 jperkin Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.timidity PKG_SUPPORTED_OPTIONS= x11 gtk @@ -30,7 +30,12 @@ WITH_XAWLIB=--with-xawlib=xaw3d WITH_XAWLIB=--with-xawlib=neXtaw .endif -CONFIGURE_ARGS+= --enable-xaw --enable-xdnd --with-xaw-resource-prefix="${PREFIX}/lib/X11/" ${WITH_XAWLIB} +CONFIGURE_ARGS+= --enable-xaw --enable-xdnd +CONFIGURE_ARGS+= --with-xaw-resource-prefix="${PREFIX}/lib/X11/" +CONFIGURE_ARGS+= ${WITH_XAWLIB} + +# This lets the trace use non-core fonts, but this wouldn't match the core +# font used by Xaw #CONFIGURE_ARGS+= --enable-xft .include "../../mk/xaw.buildlink3.mk" diff --git a/audio/timidity/patches/patch-timidity_midi_a__c.c b/audio/timidity/patches/patch-timidity_midi_a__c.c new file mode 100644 index 00000000000..3e1e5e310b2 --- /dev/null +++ b/audio/timidity/patches/patch-timidity_midi_a__c.c @@ -0,0 +1,22 @@ +$NetBSD: patch-timidity_midi_a__c.c,v 1.1 2012/07/24 19:47:44 jperkin Exp $ + +Some MIDI definitions are missing on some platform's soundcard.h, so just use +internal definitions everywhere. + +--- timidity/midi_a.c.orig 2012-07-24 00:44:02.879194950 +0300 ++++ timidity/midi_a.c 2012-07-24 00:44:21.200309747 +0300 +@@ -49,14 +49,7 @@ + #endif + #include <fcntl.h> + #include <stdlib.h> +-#ifdef HAVE_SYS_SOUNDCARD_H +-#include <sys/soundcard.h> +-#if defined(__NetBSD__) || defined(__OpenBSD__) +-#include <sys/midiio.h> +-#endif +-#else + #include "server_defs.h" +-#endif /* HAVE_SYS_SOUNDCARD_H */ + #ifdef WIN32 + #ifndef STDOUT_FILENO + #define STDOUT_FILENO 1 |