pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/cmp3 Upgrade to 2.0pre6, oked by reed & wiz.
details: https://anonhg.NetBSD.org/pkgsrc/rev/28100131b577
branches: trunk
changeset: 490056:28100131b577
user: rxg <rxg%pkgsrc.org@localhost>
date: Wed Mar 02 17:49:19 2005 +0000
description:
Upgrade to 2.0pre6, oked by reed & wiz.
diffstat:
audio/cmp3/Makefile | 12 ++++++------
audio/cmp3/distinfo | 14 +++++++-------
audio/cmp3/patches/patch-aa | 28 ++++++++++++++++++++--------
audio/cmp3/patches/patch-ab | 25 ++++++++++++++-----------
audio/cmp3/patches/patch-ac | 35 +++++++++++++++--------------------
5 files changed, 62 insertions(+), 52 deletions(-)
diffs (230 lines):
diff -r 00d97d9cd9d6 -r 28100131b577 audio/cmp3/Makefile
--- a/audio/cmp3/Makefile Wed Mar 02 16:55:37 2005 +0000
+++ b/audio/cmp3/Makefile Wed Mar 02 17:49:19 2005 +0000
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.19 2004/10/27 17:23:45 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/03/02 17:49:19 rxg Exp $
#
-DISTNAME= cmp3-2.0pre5
-PKGNAME= cmp3-2.0.p5
-PKGREVISION= 1
+DISTNAME= cmp3-2.0pre6
+PKGNAME= cmp3-2.0.p6
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmp3/}
-MAINTAINER= rxg%ms25.url.com.tw@localhost
+MAINTAINER= rxg%NetBSD.org@localhost
HOMEPAGE= http://cmp3.sourceforge.net/
COMMENT= Curses based frontend to mpg123
DEPENDS+= mpg123-[0-9]*:../../audio/mpg123
+DEPENDS+= vorbis-tools-[0-9]*:../../audio/vorbis-tools
-WRKSRC= ${WRKDIR}/cmp3
+WRKSRC= ${WRKDIR}/cmp3-kenrevs
USE_BUILDLINK3= YES
USE_GNU_TOOLS+= make
INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]*
diff -r 00d97d9cd9d6 -r 28100131b577 audio/cmp3/distinfo
--- a/audio/cmp3/distinfo Wed Mar 02 16:55:37 2005 +0000
+++ b/audio/cmp3/distinfo Wed Mar 02 17:49:19 2005 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:43 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/03/02 17:49:19 rxg Exp $
-SHA1 (cmp3-2.0pre5.tar.gz) = 9f8953fb34fdff8bafe198e1cd860d772e69cb7d
-RMD160 (cmp3-2.0pre5.tar.gz) = fa33128a593a69f1d79207072b8dcc9244a27ea5
-Size (cmp3-2.0pre5.tar.gz) = 40207 bytes
-SHA1 (patch-aa) = 9bfd95a35696361effbfde89d55bcc9c47aaa260
-SHA1 (patch-ab) = dbe2565fe5388528b6a3b32af5cf50da8512bd51
-SHA1 (patch-ac) = f242ccaeed2b194938fad2978c24dc8619dcfaf4
+SHA1 (cmp3-2.0pre6.tar.gz) = 5c1454117be282cf673de7a701f8d08f6224d2f8
+RMD160 (cmp3-2.0pre6.tar.gz) = c7d5f774c05734e8fca8ec8d536b2843cb99ad80
+Size (cmp3-2.0pre6.tar.gz) = 183749 bytes
+SHA1 (patch-aa) = 3881ea3b11f4949e0704ee13414ede93e23a7c50
+SHA1 (patch-ab) = d81276c1264d81455a623ef9c1f1eea98ed152ce
+SHA1 (patch-ac) = 92f7307c86f3e633f1e18a6ab1df421d5b09104c
SHA1 (patch-ad) = a50d87140e557eb3bef1a5d68ad3e18bba73e03e
SHA1 (patch-ae) = 4ddb74587d34dc2698c2a49ca7c476b5b90540d9
SHA1 (patch-af) = f15c60207248248f5cb7efa4c046cd246e247018
diff -r 00d97d9cd9d6 -r 28100131b577 audio/cmp3/patches/patch-aa
--- a/audio/cmp3/patches/patch-aa Wed Mar 02 16:55:37 2005 +0000
+++ b/audio/cmp3/patches/patch-aa Wed Mar 02 17:49:19 2005 +0000
@@ -1,14 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2002/02/24 22:36:49 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2005/03/02 17:50:18 rxg Exp $
---- Makefile.orig Fri Mar 17 09:35:33 2000
-+++ Makefile Fri Feb 9 23:21:25 2001
-@@ -2,23 +2,23 @@
+--- Makefile.orig 2001-07-29 13:43:49.000000000 +0800
++++ Makefile
+@@ -4,25 +4,25 @@
# Set these variables
#
# initial_directory is now set in the config file
-mpg123_location := "mpg123"
+-ogg123_location := "ogg123"
-install_directory := "$(HOME)/bin"
+mpg123_location := "$(LOCALBASE)/bin/mpg123"
++ogg123_location := "$(LOCALBASE)/bin/ogg123"
+install_directory := "$(PREFIX)/bin"
#
@@ -25,26 +27,36 @@
-ass_repository := "$(HOME)/.cmp3ass"
+#ass_repository := "$(HOME)/.cmp3ass"
- ## Define this for bufferring or add other parameters to mpg123
+ ## Define this for bufferring or add other parameters to mpg123 and ogg123
-mpg123_params := -b 320
+-ogg123_params := -d oss
+#mpg123_params := -b 320
++#ogg123_params := -d oss
# You need debugging info? Uncomment this and check /tmp/cmp3log
#debugging := 1
-@@ -37,9 +37,9 @@
+@@ -42,9 +42,9 @@ RNMP3PARAMS= -DVERSION="\$(VERSION)\"
# Something for me and my cd changer, you definately don't want it as it
# stands. Change the code to do something else you want it to do...
#PARAMS +=-DMY_CD
-LIBS= -lform -lncurses
-CFLAGS= -g -O -Inevlib
-CC= gcc
-+LIBS= ${LDFLAGS} -lform -lncurses
++LIBS= $(LDFLAGS) -lform -lncurses
+CFLAGS+= -Inevlib
+CC?= gcc
OBJS= cmp3common.o cmp3fileio.o cmp3manager.o cmp3curses.o \
cmp3llist.o cmp3main.o cmp3listfiles.o cmp3playlist.o cmp3volume.o \
cmp3general.o cmp3id3.o
-@@ -78,7 +78,7 @@
+@@ -60,6 +60,7 @@ PARAMS += -DEXEC_PARAMS="$(foreach token
+ PARAMS += -DOGG_PARAMS="$(foreach token, $(ogg123_params),\"$(token)\",)"
+ else
+ PARAMS += -DEXEC_PARAMS=\"\",
++PARAMS += -DOGG_PARAMS=\"\",
+ endif
+ ifdef filespacing
+ RNMP3PARAMS += -DSPACEIT
+@@ -87,7 +88,7 @@ cmp3: lib $(OBJS)
$(CC) $(CFLAGS) $(OBJS) nevlib/libnev.a $(LIBS) -o cmp3
lib:
diff -r 00d97d9cd9d6 -r 28100131b577 audio/cmp3/patches/patch-ab
--- a/audio/cmp3/patches/patch-ab Wed Mar 02 16:55:37 2005 +0000
+++ b/audio/cmp3/patches/patch-ab Wed Mar 02 17:49:19 2005 +0000
@@ -1,20 +1,23 @@
-$NetBSD: patch-ab,v 1.2 2002/02/24 22:36:49 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2005/03/02 17:50:18 rxg Exp $
---- cmp3.h.orig Fri Mar 17 02:14:10 2000
+--- cmp3.h.orig 2001-07-01 12:38:08.000000000 +0800
+++ cmp3.h
-@@ -1,10 +1,11 @@
+@@ -1,7 +1,7 @@
#ifndef _CMP3_H
#define _CMP3_H
--#include<curses.h>
--
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <ncurses.h>
+ #include <termios.h>
+ #else
+@@ -9,9 +9,6 @@
+ #endif
+
+
-#ifndef NCURSES_VERSION
- #error "This program requires ncurses to function"
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#include <ncurses.h>
-+#include <termios.h>
-+#else
-+#include <curses.h>
- #endif
+-#endif
#include <signal.h>
+ #include <dirent.h>
diff -r 00d97d9cd9d6 -r 28100131b577 audio/cmp3/patches/patch-ac
--- a/audio/cmp3/patches/patch-ac Wed Mar 02 16:55:37 2005 +0000
+++ b/audio/cmp3/patches/patch-ac Wed Mar 02 17:49:19 2005 +0000
@@ -1,21 +1,17 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/02/10 14:18:35 hubertf Exp $
+$NetBSD: patch-ac,v 1.2 2005/03/02 17:50:18 rxg Exp $
---- cmp3volume.c.orig Fri Feb 9 15:54:18 2001
-+++ cmp3volume.c Fri Feb 9 23:45:24 2001
-@@ -3,7 +3,11 @@
- */
-
+--- cmp3volume.c.orig 2001-07-01 12:38:08.000000000 +0800
++++ cmp3volume.c
+@@ -5,6 +5,8 @@
#include "cmp3funcs.h"
--#include<sys/soundcard.h>
-+#if defined(__NetBSD__)
+ #if defined(__FreeBSD__)
+ #include <machine/soundcard.h>
++#elif defined(__NetBSD__)
+#include <sys/audioio.h>
-+#else
-+#include <sys/soundcard.h>
-+#endif
-
- static int mixernum, /* ID number for the mixer */
- vol; /* Current volume level */
-@@ -12,6 +16,63 @@
+ #else
+ #include<sys/soundcard.h>
+ #endif
+@@ -16,6 +18,63 @@ static int mixernum,
* Initialize volume control
* Returns: nothing
****************************************************************************/
@@ -79,7 +75,7 @@
extern void initvol()
{
if ((mixernum=open("/dev/mixer", O_RDWR)) < 0) {
-@@ -26,6 +87,8 @@
+@@ -30,6 +89,8 @@ extern void initvol()
return;
}
@@ -88,7 +84,7 @@
extern void endvol()
{
close(mixernum);
-@@ -57,6 +120,23 @@
+@@ -61,6 +122,23 @@ extern void volclean()
* Although I hate users in general, we should probably do it.
* Returns: nothing
****************************************************************************/
@@ -112,7 +108,7 @@
extern void volup()
{
int i;
-@@ -71,10 +151,29 @@
+@@ -75,10 +153,29 @@ extern void volup()
return;
}
@@ -142,11 +138,10 @@
extern void voldown()
{
int i;
-@@ -89,4 +188,6 @@
+@@ -93,4 +190,6 @@ extern void voldown()
return;
}
+#endif
+
/* EOF */
-\ No newline at end of file
Home |
Main Index |
Thread Index |
Old Index