diff options
Diffstat (limited to 'audio/libdiscid')
| -rw-r--r-- | audio/libdiscid/Makefile | 6 | ||||
| -rw-r--r-- | audio/libdiscid/buildlink3.mk | 3 | ||||
| -rw-r--r-- | audio/libdiscid/distinfo | 9 | ||||
| -rw-r--r-- | audio/libdiscid/patches/patch-ab | 112 |
4 files changed, 9 insertions, 121 deletions
diff --git a/audio/libdiscid/Makefile b/audio/libdiscid/Makefile index 651b661e4b8..8c9d2207179 100644 --- a/audio/libdiscid/Makefile +++ b/audio/libdiscid/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2013/06/16 09:58:48 shattered Exp $ +# $NetBSD: Makefile,v 1.10 2014/11/21 22:59:47 mef Exp $ -DISTNAME= libdiscid-0.5.0 +DISTNAME= libdiscid-0.6.1 CATEGORIES= audio MASTER_SITES= http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/ @@ -14,7 +14,7 @@ ONLY_FOR_PLATFORM+= NetBSD-*-* OpenBSD-*-* SunOS-*-* GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= pkg-config +USE_TOOLS+= pkg-config gmake PKGCONFIG_OVERRIDE+= libdiscid.pc.in diff --git a/audio/libdiscid/buildlink3.mk b/audio/libdiscid/buildlink3.mk index 15814bc80ca..35bf56fdcfa 100644 --- a/audio/libdiscid/buildlink3.mk +++ b/audio/libdiscid/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:55 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2014/11/21 22:59:47 mef Exp $ BUILDLINK_TREE+= libdiscid @@ -6,6 +6,7 @@ BUILDLINK_TREE+= libdiscid LIBDISCID_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libdiscid+= libdiscid>=0.1.0 +BUILDLINK_ABI_DEPENDS.libdiscid?= libdiscid>=0.6.1 BUILDLINK_PKGSRCDIR.libdiscid?= ../../audio/libdiscid .endif # LIBDISCID_BUILDLINK3_MK diff --git a/audio/libdiscid/distinfo b/audio/libdiscid/distinfo index 811f7f2d2d9..6c2f5e53720 100644 --- a/audio/libdiscid/distinfo +++ b/audio/libdiscid/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.4 2013/06/16 09:58:48 shattered Exp $ +$NetBSD: distinfo,v 1.5 2014/11/21 22:59:47 mef Exp $ -SHA1 (libdiscid-0.5.0.tar.gz) = e046be72fca56bc1e5dce3568055331b58ee4dfc -RMD160 (libdiscid-0.5.0.tar.gz) = 306e23457e191c07d906bbb5eb85fec127f1c3a7 -Size (libdiscid-0.5.0.tar.gz) = 366828 bytes -SHA1 (patch-ab) = 6b626d5f7e2ca0b0bb231418429bdbea7b093dc4 +SHA1 (libdiscid-0.6.1.tar.gz) = 4e682d24bceeb35c19800f9141348d77eae133f2 +RMD160 (libdiscid-0.6.1.tar.gz) = f5e73d00adccab87037786b9c22dff98f9cb6705 +Size (libdiscid-0.6.1.tar.gz) = 366393 bytes diff --git a/audio/libdiscid/patches/patch-ab b/audio/libdiscid/patches/patch-ab deleted file mode 100644 index b45bde0b86e..00000000000 --- a/audio/libdiscid/patches/patch-ab +++ /dev/null @@ -1,112 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2013/06/16 09:58:48 shattered Exp $ - ---- src/disc_freebsd.c.orig 2013-04-12 11:46:44.000000000 +0000 -+++ src/disc_freebsd.c -@@ -47,11 +47,19 @@ - #define MB_DEFAULT_DEVICE "/dev/acd0" - - #define XA_INTERVAL ((60 + 90 + 2) * CD_FRAMES) -- -+ -+#ifdef __NetBSD__ -+#define CDIOREADTOCENTRY CDIOREADTOCENTRIES -+#endif - - static int read_toc_header(int fd, int *first, int *last) { - struct ioc_toc_header th; -+#ifdef __NetBSD__ -+ struct cd_toc_entry td; -+ struct ioc_read_toc_entry te; -+#else - struct ioc_read_toc_single_entry te; -+#endif - - int ret = ioctl(fd, CDIOREADTOCHEADER, &th); - -@@ -67,10 +75,20 @@ static int read_toc_header(int fd, int * - * session are handled correctly. - */ - te.address_format = CD_LBA_FORMAT; -+#ifdef __NetBSD__ -+ te.starting_track = th.ending_track; -+ te.data_len = sizeof(td); -+ te.data = &td; -+#else - te.track = th.ending_track; -+#endif - ret = ioctl(fd, CDIOREADTOCENTRY, &te); - -+#ifdef __NetBSD__ -+ if (( td.control & CD_DATA_TRACK) != 0 ) -+#else - if (( te.entry.control & CD_DATA_TRACK) != 0 ) -+#endif - (*last)--; - - return ret; -@@ -78,17 +96,32 @@ static int read_toc_header(int fd, int * - - - static int read_toc_entry(int fd, int track_num, unsigned long *lba) { -+#ifdef __NetBSD__ -+ struct cd_toc_entry td; -+ struct ioc_read_toc_entry te; -+#else - struct ioc_read_toc_single_entry te; -+#endif - int ret; - -+#ifdef __NetBSD__ -+ te.starting_track = track_num; -+ te.data_len = sizeof(td); -+ te.data = &td; -+#else - te.track = track_num; -+#endif - te.address_format = CD_LBA_FORMAT; - - ret = ioctl(fd, CDIOREADTOCENTRY, &te); - assert( te.address_format == CD_LBA_FORMAT ); - - if ( ret == 0 ) -+#ifdef __NetBSD__ -+ *lba = td.addr.lba; -+#else - *lba = ntohl(te.entry.addr.lba); -+#endif - - return ret; - } -@@ -96,16 +129,32 @@ static int read_toc_entry(int fd, int tr - - static int read_leadout(int fd, unsigned long *lba) { - struct ioc_toc_header th; -+#ifdef __NetBSD__ -+ struct cd_toc_entry td; -+ struct ioc_read_toc_entry te; -+#else - struct ioc_read_toc_single_entry te; -+#endif - int ret; - - ret = ioctl(fd, CDIOREADTOCHEADER, &th); -+#ifdef __NetBSD__ -+ te.starting_track = th.ending_track; -+ te.data_len = sizeof(td); -+ te.data = &td; -+#else - te.track = th.ending_track; -+#endif - te.address_format = CD_LBA_FORMAT; - ret = ioctl(fd, CDIOREADTOCENTRY, &te); - -+#ifdef __NetBSD__ -+ if (( td.control & CD_DATA_TRACK) != 0 ) { -+ *lba = td.addr.lba - 11400; -+#else - if (( te.entry.control & CD_DATA_TRACK) != 0 ) { - *lba = ntohl(te.entry.addr.lba) - 11400; -+#endif - return ret; - } - |