pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/libdiscid (pkgsrc)
details: https://anonhg.NetBSD.org/pkgsrc/rev/02f637d765ee
branches: trunk
changeset: 641954:02f637d765ee
user: mef <mef%pkgsrc.org@localhost>
date: Fri Nov 21 22:59:47 2014 +0000
description:
(pkgsrc)
- delete patch-ab, NetBSD support improved since 0.5.1
(upstream)
- Update 0.5.0 to 0.6.1
libdiscid ChangeLog:
--------------------
libdiscid-0.6.1:
- LIB-59: windows: fix bug preventing ISRC reads
libdiscid-0.6.0:
- LIB-41: add discid_get_troc_string() for fuzzy toc lookup
- LIB-54: add libmusicbrainz example with fuzzy toc lookup
- LIB-43: windows: the default drive is the first cd drive letter
- LIB-45: Linux/BSD/Solaris: try several possible default device names
- LIB-28: Mac: allow drive numbers as devices, default now "1"
- LIB-55, LIB-56: allow drive numbers for Windows and Linux
- LIB-53: discid_get_submission_url() returns the new NGS url
currently no functional change, the old url was redirected
- LIB-52: more validation for parameters of discid_put()
- LIB-48: assert successful read/put when API is used
- the discisrc example prints the name of the device usedp
libdiscid-0.5.2:
- LIB-51: fix ISRC reading on Mac OS X again
- LIB-50: fix segfault in mb_disc_load_toc on Solaris
- LIB-26: add a better test suite, including valgrind memcheck target
- print time information in the discid example
libdiscid-0.5.1:
- LIB-40: discid_get_webservice_url() (web service version 1) is deprecated
please use libmusicbrainz to gather metadata by disc ID
- LIB-7: rewrote data track handling, releases with multiple data tracks
This also fixes LIB-18 (no ID for DVDs) and LIB-9 (PS/PS2 CDs)
- LIB-44: fix invalid disc IDs on first read of multi-session discs
- LIB-37: Autotools optimization (non-recursive build etc.)
- LIB-42: remove Windows 9x platform code
- renamed openbsd platform code to netbsd, still used by both.
diffstat:
audio/libdiscid/Makefile | 6 +-
audio/libdiscid/buildlink3.mk | 3 +-
audio/libdiscid/distinfo | 9 +-
audio/libdiscid/patches/patch-ab | 112 ---------------------------------------
4 files changed, 9 insertions(+), 121 deletions(-)
diffs (168 lines):
diff -r 939a5ddf1ed0 -r 02f637d765ee audio/libdiscid/Makefile
--- a/audio/libdiscid/Makefile Fri Nov 21 22:59:44 2014 +0000
+++ b/audio/libdiscid/Makefile Fri Nov 21 22:59:47 2014 +0000
@@ -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 @@
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config gmake
PKGCONFIG_OVERRIDE+= libdiscid.pc.in
diff -r 939a5ddf1ed0 -r 02f637d765ee audio/libdiscid/buildlink3.mk
--- a/audio/libdiscid/buildlink3.mk Fri Nov 21 22:59:44 2014 +0000
+++ b/audio/libdiscid/buildlink3.mk Fri Nov 21 22:59:47 2014 +0000
@@ -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 @@
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 -r 939a5ddf1ed0 -r 02f637d765ee audio/libdiscid/distinfo
--- a/audio/libdiscid/distinfo Fri Nov 21 22:59:44 2014 +0000
+++ b/audio/libdiscid/distinfo Fri Nov 21 22:59:47 2014 +0000
@@ -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 -r 939a5ddf1ed0 -r 02f637d765ee audio/libdiscid/patches/patch-ab
--- a/audio/libdiscid/patches/patch-ab Fri Nov 21 22:59:44 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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;
- }
-
Home |
Main Index |
Thread Index |
Old Index