diff options
| -rw-r--r-- | audio/libwildmidi/Makefile | 21 | ||||
| -rw-r--r-- | audio/libwildmidi/PLIST | 7 | ||||
| -rw-r--r-- | audio/libwildmidi/distinfo | 11 | ||||
| -rw-r--r-- | audio/libwildmidi/patches/patch-configure | 13 | ||||
| -rw-r--r-- | audio/libwildmidi/patches/patch-src_Makefile.in | 15 | ||||
| -rw-r--r-- | audio/libwildmidi/patches/patch-src_wildmidi.c | 38 |
6 files changed, 20 insertions, 85 deletions
diff --git a/audio/libwildmidi/Makefile b/audio/libwildmidi/Makefile index 46e7649e9ed..591477392ff 100644 --- a/audio/libwildmidi/Makefile +++ b/audio/libwildmidi/Makefile @@ -1,23 +1,24 @@ -# $NetBSD: Makefile,v 1.2 2012/09/12 00:24:45 asau Exp $ -# +# $NetBSD: Makefile,v 1.3 2014/03/31 08:31:19 wiz Exp $ -DISTNAME= wildmidi-0.2.3.4 +DISTNAME= wildmidi-0.3.5 PKGNAME= ${DISTNAME:S/wildmidi/libwildmidi/} CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wildmidi/} +MASTER_SITES= https://github.com/Mindwerks/wildmidi/archive/ MAINTAINER= pallegra@gmail.com -HOMEPAGE= http://wildmidi.sourceforge.net/ +HOMEPAGE= http://www.mindwerks.net/projects/wildmidi/ COMMENT= Midi processing library and a midi player using the GUS patch set LICENSE= gnu-lgpl-v3 +WRKSRC= ${WRKDIR}/wildmidi-${DISTNAME} USE_TOOLS+= gmake -GNU_CONFIGURE= yes -USE_LIBTOOL= yes +USE_CMAKE= yes -CONFIGURE_ARGS+= --with-wildmidi-cfg=${PKG_SYSCONFDIR}/timidity.cfg -CONFIGURE_ARGS+= --disable-werror -CONFIGURE_ARGS+= --with-oss +SUBST_CLASSES+= man +SUBST_SED.man+= -e "s,share/man,${PKGMANDIR}," +SUBST_FILES.man+= src/CMakeLists.txt +SUBST_STAGE.man= post-extract +SUBST_MESSAGE.man= Fixing man page installation path. .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libwildmidi/PLIST b/audio/libwildmidi/PLIST index 0a2f3112f08..405d5b9725a 100644 --- a/audio/libwildmidi/PLIST +++ b/audio/libwildmidi/PLIST @@ -1,7 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/11/30 13:47:15 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2014/03/31 08:31:19 wiz Exp $ bin/wildmidi include/wildmidi_lib.h -lib/libWildMidi.la +lib/libWildMidi.so +lib/libWildMidi.so.1 +lib/libWildMidi.so.1.0.2 man/man1/wildmidi.1 man/man3/WildMidi_Close.3 man/man3/WildMidi_FastSeek.3 @@ -9,6 +11,7 @@ man/man3/WildMidi_GetInfo.3 man/man3/WildMidi_GetOutput.3 man/man3/WildMidi_GetString.3 man/man3/WildMidi_Init.3 +man/man3/WildMidi_Live.3 man/man3/WildMidi_MasterVolume.3 man/man3/WildMidi_Open.3 man/man3/WildMidi_OpenBuffer.3 diff --git a/audio/libwildmidi/distinfo b/audio/libwildmidi/distinfo index 9d477677839..9fcb90400ad 100644 --- a/audio/libwildmidi/distinfo +++ b/audio/libwildmidi/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.3 2013/10/28 23:43:35 joerg Exp $ +$NetBSD: distinfo,v 1.4 2014/03/31 08:31:19 wiz Exp $ -SHA1 (wildmidi-0.2.3.4.tar.gz) = 99ffeb54980a29c5aa44f4cb152ad37acbe877bc -RMD160 (wildmidi-0.2.3.4.tar.gz) = 50b4102f0b305ca0afd7649957a3a94343dbf2d6 -Size (wildmidi-0.2.3.4.tar.gz) = 348971 bytes -SHA1 (patch-configure) = 615aacc23c7a4a083d039be9df14219dda05d7c9 -SHA1 (patch-src_Makefile.in) = c04041123a882bda5b0029f70e69fda17b381638 -SHA1 (patch-src_wildmidi.c) = 6217cb6992d1eb6e04e2b55937fc555b658dc434 +SHA1 (wildmidi-0.3.5.tar.gz) = e69cb90b6bb8c378b22381aab7c0713a9f17dfbd +RMD160 (wildmidi-0.3.5.tar.gz) = 666ed7aa6009e1f215e271732c687093073ed68f +Size (wildmidi-0.3.5.tar.gz) = 118925 bytes diff --git a/audio/libwildmidi/patches/patch-configure b/audio/libwildmidi/patches/patch-configure deleted file mode 100644 index a076f506f7b..00000000000 --- a/audio/libwildmidi/patches/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-configure,v 1.1 2013/10/28 23:43:35 joerg Exp $ - ---- configure.orig 2013-10-18 12:36:49.000000000 +0000 -+++ configure -@@ -11212,7 +11212,7 @@ fi - if test "x$optimize" = xyes; then - if test "x$GCC" = xyes; then - BUILD_TYPE="$BUILD_TYPE Optimized" -- CFLAGS="$CFLAGS -O2 -std=gnu99 -frename-registers -finline-limit=32000 -Winline -ffast-math -funroll-loops -fexpensive-optimizations -finline-functions" -+ CFLAGS="$CFLAGS -O2 -std=gnu99 -Winline -ffast-math -funroll-loops" - else - CFLAGS="$CFLAGS -O2" - fi diff --git a/audio/libwildmidi/patches/patch-src_Makefile.in b/audio/libwildmidi/patches/patch-src_Makefile.in deleted file mode 100644 index 18a1b0f83fa..00000000000 --- a/audio/libwildmidi/patches/patch-src_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_Makefile.in,v 1.1.1.1 2011/11/30 13:47:16 wiz Exp $ - -Link against libossaudio where necessary. - ---- src/Makefile.in.orig 2010-07-30 04:36:20.000000000 +0000 -+++ src/Makefile.in -@@ -227,7 +227,7 @@ libWildMidi_la_LDFLAGS = -version-info $ - libWildMidi_la_LIBADD = -lm -lc - wildmidi_libs = ./libWildMidi.la - wildmidi_SOURCES = wildmidi.c --wildmidi_LDADD = $(AUDDR) $(LDFLAGS) -L./ -lWildMidi -+wildmidi_LDADD = $(AUDDR) $(LDFLAGS) -L./ -lWildMidi $(LIBOSSAUDIO) - wildmidi_DEPENDENCIES = ./libWildMidi.la - all: all-am - diff --git a/audio/libwildmidi/patches/patch-src_wildmidi.c b/audio/libwildmidi/patches/patch-src_wildmidi.c deleted file mode 100644 index 111bac70ae0..00000000000 --- a/audio/libwildmidi/patches/patch-src_wildmidi.c +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-src_wildmidi.c,v 1.2 2012/02/15 22:05:24 hans Exp $ - -On NetBSD, FNONBLOCK is only defined for the kernel. -Define MAP_FILE if necessary. -Fix device name in printf. - ---- src/wildmidi.c.orig 2010-07-30 00:33:46.000000000 +0000 -+++ src/wildmidi.c -@@ -63,7 +63,15 @@ - #include "wildmidi_lib.h" - - #ifndef FNONBLOCK -+#ifdef _FNONBLOCK - #define FNONBLOCK _FNONBLOCK -+#else -+#define FNONBLOCK O_NONBLOCK -+#endif -+#endif -+ -+#ifndef MAP_FILE -+#define MAP_FILE 0 - #endif - - -@@ -573,11 +581,11 @@ open_oss_output( void ) { - } - - if ((audio_fd = open(pcmname, omode)) < 0) { -- printf("ERROR: Unable to open /dev/dsp (%s)\r\n",strerror(errno)); -+ printf("ERROR: Unable to open %s (%s)\r\n",pcmname, strerror(errno)); - return -1; - } - if (ioctl (audio_fd, SNDCTL_DSP_RESET, 0) < 0) { -- printf("ERROR: Unable to reset /dev/dsp\r\n"); -+ printf("ERROR: Unable to reset %s\r\n, pcmname"); - shutdown_output(); - return -1; - } |