Changes 0.93:

- Add cdio_free, iso9660_stat_free, and iso9660_xa_free functions.
- Deprecate mmc_isrc_track_read_subchannel
- Add mmc_get_track_isrc function.
- Update OS versions we recognize
- OSX, and MS Windows, ISO 9660 and other bug fixes
- Remove Coverty scan warnins and errors
- OS/2 driver performance update

6 files changed, 30 insertions, 63 deletions

diff --git a/misc/libcdio/Makefile b/misc/libcdio/Makefile
index 6f54bef1a61..68f325a3acc 100644
--- a/misc/libcdio/Makefile
+++ b/misc/libcdio/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2014/05/29 23:36:58 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2014/10/09 11:55:22 adam Exp $
 
-DISTNAME=	libcdio-0.83
-PKGREVISION=	3
+DISTNAME=	libcdio-0.93
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU:=libcdio/}
 
@@ -12,23 +11,20 @@ LICENSE=	gnu-gpl-v3
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_PKGLOCALEDIR=	yes
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake perl:run pkg-config
-USE_LANGUAGES=		c c++
 PKGCONFIG_OVERRIDE+=	libcdio.pc.in
 PKGCONFIG_OVERRIDE+=	libcdio++.pc.in
-PKGCONFIG_OVERRIDE+=	libcdio_cdda.pc.in
-PKGCONFIG_OVERRIDE+=	libcdio_paranoia.pc.in
 PKGCONFIG_OVERRIDE+=	libiso9660.pc.in
 PKGCONFIG_OVERRIDE+=	libiso9660++.pc.in
 PKGCONFIG_OVERRIDE+=	libudf.pc.in
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-versioned-libs
-CONFIGURE_ARGS+=	--enable-cpp-progs
 INFO_FILES=		yes
 
+.include "../../audio/libcddb/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
-.include "../../audio/libcddb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/libcdio/PLIST b/misc/libcdio/PLIST
index a9a4b2fab26..3c07f57339a 100644
--- a/misc/libcdio/PLIST
+++ b/misc/libcdio/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.16 2012/08/13 17:23:37 drochner Exp $
+@comment $NetBSD: PLIST,v 1.17 2014/10/09 11:55:22 adam Exp $
 bin/cd-drive
 bin/cd-info
-bin/cd-paranoia
 bin/cd-read
 bin/cdda-player
 bin/iso-info
@@ -21,10 +20,8 @@ include/cdio/audio.h
 include/cdio/bytesex.h
 include/cdio/bytesex_asm.h
 include/cdio/cd_types.h
-include/cdio/cdda.h
 include/cdio/cdio.h
 include/cdio/cdio_config.h
-include/cdio/cdio_unconfig.h
 include/cdio/cdtext.h
 include/cdio/device.h
 include/cdio/disc.h
@@ -33,12 +30,12 @@ include/cdio/dvd.h
 include/cdio/ecma_167.h
 include/cdio/iso9660.h
 include/cdio/logging.h
+include/cdio/memory.h
 include/cdio/mmc.h
 include/cdio/mmc_cmds.h
 include/cdio/mmc_hl_cmds.h
 include/cdio/mmc_ll_cmds.h
 include/cdio/mmc_util.h
-include/cdio/paranoia.h
 include/cdio/posix.h
 include/cdio/read.h
 include/cdio/rock.h
@@ -55,22 +52,16 @@ include/cdio/xa.h
 info/libcdio.info
 lib/libcdio++.la
 lib/libcdio.la
-lib/libcdio_cdda.la
-lib/libcdio_paranoia.la
 lib/libiso9660++.la
 lib/libiso9660.la
 lib/libudf.la
 lib/pkgconfig/libcdio++.pc
 lib/pkgconfig/libcdio.pc
-lib/pkgconfig/libcdio_cdda.pc
-lib/pkgconfig/libcdio_paranoia.pc
 lib/pkgconfig/libiso9660++.pc
 lib/pkgconfig/libiso9660.pc
 lib/pkgconfig/libudf.pc
-man/jp/man1/cd-paranoia.1
 man/man1/cd-drive.1
 man/man1/cd-info.1
-man/man1/cd-paranoia.1
 man/man1/cd-read.1
 man/man1/iso-info.1
 man/man1/iso-read.1
diff --git a/misc/libcdio/distinfo b/misc/libcdio/distinfo
index 631def93761..946b446908c 100644
--- a/misc/libcdio/distinfo
+++ b/misc/libcdio/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.23 2012/08/13 17:23:37 drochner Exp $
+$NetBSD: distinfo,v 1.24 2014/10/09 11:55:22 adam Exp $
 
-SHA1 (libcdio-0.83.tar.gz) = 43f55972b23fd196d15fd6db17354a1d28e2bb24
-RMD160 (libcdio-0.83.tar.gz) = 37a9acd3e56870367bf02034810e3b823bb2cea7
-Size (libcdio-0.83.tar.gz) = 2323747 bytes
+SHA1 (libcdio-0.93.tar.gz) = bc3f599b0b77d8d186c0afc66495f721747c5293
+RMD160 (libcdio-0.93.tar.gz) = 9bef344a90c4704c78666e29d2e88db7c42536ce
+Size (libcdio-0.93.tar.gz) = 2723371 bytes
 SHA1 (patch-aa) = 8e70ee2840c19da3efc0c47dfa9f7ea400a1ec2e
 SHA1 (patch-ab) = 73bd86ecfa0c728eab231bce36317ab7f616fa4c
-SHA1 (patch-ac) = 7bea49d753bb88d8fa2b5b87a4e9a327c5d7f05f
-SHA1 (patch-ad) = abf29432bdc06e901a734d659393e80ad8a608fe
-SHA1 (patch-ae) = 488820cb527eff082bb76d1d33e581e4adf91c35
+SHA1 (patch-ad) = c9ab4e9be23c7ec6091b3daff33863e803445682
diff --git a/misc/libcdio/patches/patch-ac b/misc/libcdio/patches/patch-ac
deleted file mode 100644
index f547dd5b076..00000000000
--- a/misc/libcdio/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2008/11/10 22:30:43 wiz Exp $
-
---- src/cd-paranoia/cd-paranoia.c.orig	2008-06-25 07:52:33.000000000 +0000
-+++ src/cd-paranoia/cd-paranoia.c
-@@ -276,7 +276,7 @@ display_toc(cdrom_drive_t *d)
-   report("");
- }
- 
--#include "usage.h"
-+#include "usage-copy.h"
- static void usage(FILE *f)
- {
-   fprintf( f, usage_help);
diff --git a/misc/libcdio/patches/patch-ad b/misc/libcdio/patches/patch-ad
index 15ba796d699..ce4c25bf58b 100644
--- a/misc/libcdio/patches/patch-ad
+++ b/misc/libcdio/patches/patch-ad
@@ -1,14 +1,23 @@
-$NetBSD: patch-ad,v 1.3 2011/03/13 11:36:19 drochner Exp $
+$NetBSD: patch-ad,v 1.4 2014/10/09 11:55:22 adam Exp $
 
---- lib/driver/netbsd.c.orig	2008-11-29 04:52:43.000000000 +0000
+--- lib/driver/netbsd.c.orig	2014-06-21 02:10:56.000000000 +0000
 +++ lib/driver/netbsd.c
-@@ -265,6 +265,9 @@ _cdio_read_toc(_img_private_t *_obj) 
- 	}
+@@ -55,7 +55,7 @@
+ #include "cdio_assert.h"
+ #include "cdio_private.h"
  
- 	_obj->toc_valid = 1;
-+	_obj->gen.i_first_track = FIRST_TRACK_NUM;
-+	_obj->gen.i_tracks = TOTAL_TRACKS;
-+	_obj->gen.toc_init = true;
- 	return true;
+-#if defined(__NetBSD__) && defined(__i386__)
++#if defined(__NetBSD__) && (defined(__i386__) || defined(__amd64__))
+ #define DEFAULT_CDIO_DEVICE "/dev/rcd0d"
+ #else
+ #define DEFAULT_CDIO_DEVICE "/dev/rcd0c"
+@@ -268,6 +268,9 @@ _cdio_read_toc(_img_private_t *_obj) 
+         }
+ 
+         _obj->toc_valid = 1;
++        _obj->gen.i_first_track = FIRST_TRACK_NUM;
++        _obj->gen.i_tracks = TOTAL_TRACKS;
++        _obj->gen.toc_init = true;
+         return true;
  }
  
diff --git a/misc/libcdio/patches/patch-ae b/misc/libcdio/patches/patch-ae
deleted file mode 100644
index 833b49338fe..00000000000
--- a/misc/libcdio/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2012/08/13 17:24:38 drochner Exp $
-
---- include/cdio/types.h.orig	2011-10-20 22:38:50.000000000 +0000
-+++ include/cdio/types.h
-@@ -169,9 +169,6 @@ typedef uint8_t ubyte;
- # define GNUC_UNLIKELY(x) (x)
- #endif
-   
--#ifndef NULL
--# define NULL ((void*) 0)
--#endif
-   
-   /* our own offsetof()-like macro */
- #define __cd_offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)