diff options
author | jperkin <jperkin> | 2013-01-22 10:42:06 +0000 |
---|---|---|
committer | jperkin <jperkin> | 2013-01-22 10:42:06 +0000 |
commit | 9ed30bfba2741364d272bf6d6d18b709020236fc (patch) | |
tree | c9d1d159aa8508e73a3fd9331e8dedd51e8485b5 | |
parent | e3a56e33db79c74d9ad8be0afa25f6c9bf3bbaab (diff) | |
download | pkgsrc-9ed30bfba2741364d272bf6d6d18b709020236fc.tar.gz |
Update to cd-discid-1.3.1. Notable changes since 0.9 are:
- New upstream maintainer.
- Try to use a default cdrom device if none is specified.
- Add --musicbrainz option for output suitable for calculating a
MusicBrainz DiscID.
-rw-r--r-- | audio/cd-discid/Makefile | 8 | ||||
-rw-r--r-- | audio/cd-discid/distinfo | 11 | ||||
-rw-r--r-- | audio/cd-discid/patches/patch-aa | 31 | ||||
-rw-r--r-- | audio/cd-discid/patches/patch-ab | 15 |
4 files changed, 44 insertions, 21 deletions
diff --git a/audio/cd-discid/Makefile b/audio/cd-discid/Makefile index f4b56e8ae61..ca326f627f8 100644 --- a/audio/cd-discid/Makefile +++ b/audio/cd-discid/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2013/01/21 22:24:55 jperkin Exp $ +# $NetBSD: Makefile,v 1.18 2013/01/22 10:42:06 jperkin Exp $ -DISTNAME= cd-discid_0.9.orig -PKGNAME= cd-discid-0.9 -PKGREVISION= 1 +DISTNAME= cd-discid-1.3.1 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_GENTOO:=distfiles/} +MASTER_SITES= http://linukz.org/download/ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Read CD to obtain CDDB discid information diff --git a/audio/cd-discid/distinfo b/audio/cd-discid/distinfo index b69b7ee880b..61ecf66412d 100644 --- a/audio/cd-discid/distinfo +++ b/audio/cd-discid/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.5 2013/01/21 22:24:56 jperkin Exp $ +$NetBSD: distinfo,v 1.6 2013/01/22 10:42:06 jperkin Exp $ -SHA1 (cd-discid_0.9.orig.tar.gz) = 389c3b5bbfb96b113f85a8d206f9d0d7052146a4 -RMD160 (cd-discid_0.9.orig.tar.gz) = 58049ba778243019a96ab7f8d8eaf213e8eca4fa -Size (cd-discid_0.9.orig.tar.gz) = 11217 bytes -SHA1 (patch-aa) = 7ce1a368262880ad9c5be43e15790d491abd53c8 +SHA1 (cd-discid-1.3.1.tar.gz) = 32580d3fa446c59d6519c700e1180efb7d5fe23e +RMD160 (cd-discid-1.3.1.tar.gz) = 1b4fc78212f3ce004edf1337b9e43c210b555a94 +Size (cd-discid-1.3.1.tar.gz) = 12204 bytes +SHA1 (patch-aa) = d5270a000e5db904fcf41084ac3362eeba3752a2 +SHA1 (patch-ab) = 3edf0e6373307a1d3a115f41fac39eaee1fc3aa2 diff --git a/audio/cd-discid/patches/patch-aa b/audio/cd-discid/patches/patch-aa index 04e00f5ccb0..a5a08e9c2fe 100644 --- a/audio/cd-discid/patches/patch-aa +++ b/audio/cd-discid/patches/patch-aa @@ -1,20 +1,29 @@ -$NetBSD: patch-aa,v 1.2 2013/01/21 22:24:56 jperkin Exp $ +$NetBSD: patch-aa,v 1.3 2013/01/22 10:42:06 jperkin Exp $ - Add support for DragonFly -- Fix output on OSX +- Fix output on OSX, and use raw disk device. ---- cd-discid.c.orig 2003-12-15 23:55:00.000000000 +0000 -+++ cd-discid.c 2013-01-21 22:20:21.000000000 +0000 -@@ -37,7 +37,7 @@ - * to compile on Solaris */ - #define cdte_track_address cdte_addr.lba +--- cd-discid.c.orig 2013-01-22 10:30:56.000000000 +0000 ++++ cd-discid.c 2013-01-22 10:34:05.000000000 +0000 +@@ -50,7 +50,7 @@ + /* __FreeBSD_kernel__ is needed for properly compiling on Debian GNU/kFreeBSD + Look at http://glibc-bsd.alioth.debian.org/porting/PORTING for more info */ --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) +-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include <sys/cdio.h> #define CDROM_LBA CD_LBA_FORMAT /* first frame is 0 */ -@@ -194,7 +194,7 @@ +@@ -100,7 +100,7 @@ + #define cdth_trk1 lastTrackNumberInLastSessionLSB + #define cdrom_tocentry CDTrackInfo + #define cdte_track_address trackStartAddress +-#define DEVICE_NAME "/dev/disk1" ++#define DEVICE_NAME "/dev/rdisk1" + + #else + # error "Your OS isn't supported yet." +@@ -221,7 +221,7 @@ * TocEntry[last-1].lastRecordedAddress + 1, so we compute the start * of leadout from the start+length of the last track instead */ @@ -23,7 +32,7 @@ $NetBSD: patch-aa,v 1.2 2013/01/21 22:24:56 jperkin Exp $ #else /* FreeBSD, Linux, Solaris */ for (i=0; i < last; i++) { /* tracks start with 1, but I must start with 0 on OpenBSD */ -@@ -214,12 +214,12 @@ +@@ -241,12 +241,12 @@ } #endif diff --git a/audio/cd-discid/patches/patch-ab b/audio/cd-discid/patches/patch-ab new file mode 100644 index 00000000000..fb6e0832bde --- /dev/null +++ b/audio/cd-discid/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.1 2013/01/22 10:42:06 jperkin Exp $ + +- Use raw device on OSX. + +--- cd-discid.1.orig 2013-01-22 10:38:34.000000000 +0000 ++++ cd-discid.1 2013-01-22 10:38:40.000000000 +0000 +@@ -33,7 +33,7 @@ + OpenBSD and NetBSD + .IP \fI/dev/vol/aliases/cdrom0\fP + Solaris +-.IP \fI/dev/disk1\fP ++.IP \fI/dev/rdisk1\fP + MacOS X + .IP \fI/dev/cd0\fP + Hurd |