From 4ba262c7c1efaae87e6b0b57ff2dc069fc0385d6 Mon Sep 17 00:00:00 2001 From: agc Date: Thu, 8 Jul 2004 18:33:06 +0000 Subject: Install bplay and brec as well as gramofile. Use /dev/sound on NetBSD. Bring in ossaudio via buildlink3. Bump PKGREVISION. Fixes the problems reported in PR 26206 by Ole Hellqvist --- audio/gramofile/Makefile | 8 ++++++-- audio/gramofile/PLIST | 4 +++- audio/gramofile/distinfo | 6 ++++-- audio/gramofile/patches/patch-aa | 10 +++++----- audio/gramofile/patches/patch-ab | 34 ++++++++++++++++++++++++++++++++++ audio/gramofile/patches/patch-ac | 16 ++++++++++++++++ 6 files changed, 68 insertions(+), 10 deletions(-) create mode 100644 audio/gramofile/patches/patch-ab create mode 100644 audio/gramofile/patches/patch-ac (limited to 'audio') diff --git a/audio/gramofile/Makefile b/audio/gramofile/Makefile index d663d29b8c7..b9aab6aca19 100644 --- a/audio/gramofile/Makefile +++ b/audio/gramofile/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2004/07/04 22:40:11 agc Exp $ +# $NetBSD: Makefile,v 1.3 2004/07/08 18:33:06 agc Exp $ # DISTNAME= gramofile-1.6 +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= http://panic.et.tudelft.nl/~costar/gramofile/ @@ -9,13 +10,16 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://panic.et.tudelft.nl/~costar/gramofile/ COMMENT= Tool for ripping audio from vinyl -ALL_TARGET= gramofile +ALL_TARGET= gramofile makebplay USE_BUILDLINK3= yes USE_GNU_TOOLS+= make do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gramofile ${PREFIX}/bin/gramofile + ${INSTALL_PROGRAM} ${WRKSRC}/bplaysrc/bplay ${PREFIX}/bin/bplay_gramo + cd ${PREFIX}/bin && ${LN} -s bplay_gramo brec_gramo .include "../../mk/curses.buildlink3.mk" +.include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/gramofile/PLIST b/audio/gramofile/PLIST index f32ae52705f..c26b65b263f 100644 --- a/audio/gramofile/PLIST +++ b/audio/gramofile/PLIST @@ -1,2 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2004/07/04 22:40:11 agc Exp $ +@comment $NetBSD: PLIST,v 1.3 2004/07/08 18:33:07 agc Exp $ bin/gramofile +bin/bplay_gramo +bin/brec_gramo diff --git a/audio/gramofile/distinfo b/audio/gramofile/distinfo index abf8b844671..515abe5dace 100644 --- a/audio/gramofile/distinfo +++ b/audio/gramofile/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/07/04 22:35:40 agc Exp $ +$NetBSD: distinfo,v 1.2 2004/07/08 18:33:07 agc Exp $ SHA1 (gramofile-1.6.tar.gz) = 6e5365d9e04801725be694fefcff5fc10ea2f912 Size (gramofile-1.6.tar.gz) = 108596 bytes -SHA1 (patch-aa) = 204d1879eca0d2ae9a8426d3f06f8b4f2a97b213 +SHA1 (patch-aa) = 0e3912dc5c5470f5ca9cb5916467af7ffa8b52fb +SHA1 (patch-ab) = cdb6ed27cb4e4f6fc91a34a12369caa2a52e94d9 +SHA1 (patch-ac) = f6d8bafe59fa5ab55d14999436edb28cc1c01c29 diff --git a/audio/gramofile/patches/patch-aa b/audio/gramofile/patches/patch-aa index 61f8bb00813..7adf7662588 100644 --- a/audio/gramofile/patches/patch-aa +++ b/audio/gramofile/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/07/04 22:35:40 agc Exp $ +$NetBSD: patch-aa,v 1.2 2004/07/08 18:33:07 agc Exp $ --- Makefile 2004/07/02 20:20:40 1.1 +++ Makefile 2004/07/02 20:24:26 @@ -8,7 +8,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/07/04 22:35:40 agc Exp $ +OS= $(shell uname -s) + -+ifeq ($(OS), "Linux") ++ifeq ($(OS), Linux) # For Linux (and maybe others), use these: CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER DEPS = $(OBJS) makebplay @@ -16,16 +16,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/07/04 22:35:40 agc Exp $ COPY_A = -a - +else -+ifeq ($(OS), "NetBSD") ++ifeq ($(OS), NetBSD) # For FreeBSD (and maybe others), use these: -#CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER -#DEPS = $(OBJS) makebplay -#LIBS = -lncurses -lm -#COPY_A = -p - -+CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER ++CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER -DOLD_CURSES +DEPS = $(OBJS) makebplay -+LIBS = -lncurses -lm ++LIBS = -lcurses -lm +COPY_A = -p +else # For IRIX (and maybe others), use these: diff --git a/audio/gramofile/patches/patch-ab b/audio/gramofile/patches/patch-ab new file mode 100644 index 00000000000..f4b66d509c5 --- /dev/null +++ b/audio/gramofile/patches/patch-ab @@ -0,0 +1,34 @@ +$NetBSD: patch-ab,v 1.1 2004/07/08 18:33:07 agc Exp $ + +--- bplaysrc/Makefile 2004/07/08 15:10:58 1.1 ++++ bplaysrc/Makefile 2004/07/08 15:12:18 +@@ -6,18 +6,24 @@ + ../clrscr.o ../secshms.o + #SRCS = bplay.c sndfunc.o shmbuf.c + +-CC = gcc +-LDFLAGS = ++#CC = gcc ++#LDFLAGS = + + ########## CHOOSE YOUR ARCHITECTURE: (NOTE: also see ../Makefile!) + ++OS= $(shell uname -s) ++ ++ifeq (${OS}, Linux) + # For Linux (and maybe others), use these: + CFLAGS = -Wall -O2 -DUSEBUFFLOCK -DREDHAT50 -DLP2CD -DVUMETER # -DDEBUG + LIBS = -lncurses +- ++else ++ifeq (${OS}, NetBSD) + # For FreeBSD (and maybe others), use these: +-#CFLAGS = -Wall -O2 -DLP2CD -DVUMETER # -DDEBUG +-#LIBS = -lncurses ++CFLAGS = -Wall -O2 -DLP2CD -DVUMETER -DOLD_CURSES -D_SEM_SEMUN_UNDEFINED # -DDEBUG ++LIBS = -lcurses ${LIBOSSAUDIO} ++endif ++endif + + # -DOLD_CURSES can be used here, too. + diff --git a/audio/gramofile/patches/patch-ac b/audio/gramofile/patches/patch-ac new file mode 100644 index 00000000000..5027df9f88d --- /dev/null +++ b/audio/gramofile/patches/patch-ac @@ -0,0 +1,16 @@ +$NetBSD: patch-ac,v 1.1 2004/07/08 18:33:07 agc Exp $ + +--- bplaysrc/sndfunc.c 2004/07/08 18:26:58 1.1 ++++ bplaysrc/sndfunc.c 2004/07/08 18:27:22 +@@ -18,7 +18,11 @@ + #include + #endif + ++#ifdef __NetBSD__ ++#define AUDIO "/dev/sound" ++#else + #define AUDIO "/dev/dsp" ++#endif + + /* Globals */ + int audio, abuf_size, fmt_mask; -- cgit v1.2.3