Mon Apr 29 17:22:05 2019 UTC ()
libcdio: re-enable cdda-player for NetBSD


(adam)
diff -r1.60 -r1.61 pkgsrc/misc/libcdio/Makefile
diff -r1.18 -r1.19 pkgsrc/misc/libcdio/PLIST
diff -r1.30 -r1.31 pkgsrc/misc/libcdio/distinfo
diff -r1.5 -r0 pkgsrc/misc/libcdio/patches/patch-aa
diff -r1.7 -r0 pkgsrc/misc/libcdio/patches/patch-ab
diff -r0 -r1.1 pkgsrc/misc/libcdio/patches/patch-configure
diff -r0 -r1.1 pkgsrc/misc/libcdio/patches/patch-include_cdio++_iso9660.hpp
diff -r0 -r1.1 pkgsrc/misc/libcdio/patches/patch-lib_driver_logging.c
cvs diff -r1.60 -r1.61 pkgsrc/misc/libcdio/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/libcdio/Makefile 2019/04/18 17:04:37 1.60
+++ pkgsrc/misc/libcdio/Makefile 2019/04/29 17:22:04 1.61
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.60 2019/04/18 17:04:37 gdt Exp $ 1# $NetBSD: Makefile,v 1.61 2019/04/29 17:22:04 adam Exp $
2 2
3DISTNAME= libcdio-2.1.0 3DISTNAME= libcdio-2.1.0
 4PKGREVISION= 1
4CATEGORIES= misc 5CATEGORIES= misc
5MASTER_SITES= ${MASTER_SITE_GNU:=libcdio/} 6MASTER_SITES= ${MASTER_SITE_GNU:=libcdio/}
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.gnu.org/software/libcdio/ 10HOMEPAGE= http://www.gnu.org/software/libcdio/
10COMMENT= CD-ROM access library 11COMMENT= CD-ROM access library
11LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
12 13
13USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
14USE_LIBTOOL= yes 15USE_LIBTOOL= yes
15USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
16USE_TOOLS+= gmake perl:run pkg-config 17USE_TOOLS+= gmake perl:run pkg-config
 18GNU_CONFIGURE= yes
 19CONFIGURE_ARGS+= --without-versioned-libs
 20INFO_FILES= yes
17PKGCONFIG_OVERRIDE+= libcdio.pc.in 21PKGCONFIG_OVERRIDE+= libcdio.pc.in
18PKGCONFIG_OVERRIDE+= libcdio++.pc.in 22PKGCONFIG_OVERRIDE+= libcdio++.pc.in
19PKGCONFIG_OVERRIDE+= libiso9660.pc.in 23PKGCONFIG_OVERRIDE+= libiso9660.pc.in
20PKGCONFIG_OVERRIDE+= libiso9660++.pc.in 24PKGCONFIG_OVERRIDE+= libiso9660++.pc.in
21PKGCONFIG_OVERRIDE+= libudf.pc.in 25PKGCONFIG_OVERRIDE+= libudf.pc.in
22GNU_CONFIGURE= yes 
23CONFIGURE_ARGS+= --without-versioned-libs 
24INFO_FILES= yes 
25 
26TEST_TARGET= check 26TEST_TARGET= check
27 27
28.include "../../audio/libcddb/buildlink3.mk" 28.include "../../audio/libcddb/buildlink3.mk"
29.include "../../devel/ncurses/buildlink3.mk" 29.include "../../devel/ncurses/buildlink3.mk"
30.include "../../devel/popt/buildlink3.mk" 30.include "../../devel/popt/buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/misc/libcdio/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/libcdio/PLIST 2019/04/18 17:04:37 1.18
+++ pkgsrc/misc/libcdio/PLIST 2019/04/29 17:22:04 1.19
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1@comment $NetBSD: PLIST,v 1.18 2019/04/18 17:04:37 gdt Exp $ 1@comment $NetBSD: PLIST,v 1.19 2019/04/29 17:22:04 adam Exp $
2bin/cd-drive 2bin/cd-drive
3bin/cd-info 3bin/cd-info
4bin/cd-read 4bin/cd-read
 5bin/cdda-player
5bin/iso-info 6bin/iso-info
6bin/iso-read 7bin/iso-read
7bin/mmc-tool 8bin/mmc-tool
8include/cdio++/cdio.hpp 9include/cdio++/cdio.hpp
9include/cdio++/cdtext.hpp 10include/cdio++/cdtext.hpp
10include/cdio++/device.hpp 11include/cdio++/device.hpp
11include/cdio++/devices.hpp 12include/cdio++/devices.hpp
12include/cdio++/disc.hpp 13include/cdio++/disc.hpp
13include/cdio++/enum.hpp 14include/cdio++/enum.hpp
14include/cdio++/iso9660.hpp 15include/cdio++/iso9660.hpp
15include/cdio++/mmc.hpp 16include/cdio++/mmc.hpp
16include/cdio++/read.hpp 17include/cdio++/read.hpp
17include/cdio++/track.hpp 18include/cdio++/track.hpp
cvs diff -r1.30 -r1.31 pkgsrc/misc/libcdio/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/libcdio/distinfo 2019/04/18 17:04:37 1.30
+++ pkgsrc/misc/libcdio/distinfo 2019/04/29 17:22:04 1.31
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.30 2019/04/18 17:04:37 gdt Exp $ 1$NetBSD: distinfo,v 1.31 2019/04/29 17:22:04 adam Exp $
2 2
3SHA1 (libcdio-2.1.0.tar.bz2) = ec22e5168bc0dcfc179ec7b1164af1e5b672ca89 3SHA1 (libcdio-2.1.0.tar.bz2) = ec22e5168bc0dcfc179ec7b1164af1e5b672ca89
4RMD160 (libcdio-2.1.0.tar.bz2) = 6b0e4917cd2dd5cac0b7afdb70789bf0ad2aed79 4RMD160 (libcdio-2.1.0.tar.bz2) = 6b0e4917cd2dd5cac0b7afdb70789bf0ad2aed79
5SHA512 (libcdio-2.1.0.tar.bz2) = c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f 5SHA512 (libcdio-2.1.0.tar.bz2) = c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
6Size (libcdio-2.1.0.tar.bz2) = 1759040 bytes 6Size (libcdio-2.1.0.tar.bz2) = 1759040 bytes
7SHA1 (patch-aa) = 8e70ee2840c19da3efc0c47dfa9f7ea400a1ec2e 7SHA1 (patch-configure) = ef72517e444df4834608d152f5e9ce625297d64e
8SHA1 (patch-ab) = 73bd86ecfa0c728eab231bce36317ab7f616fa4c 8SHA1 (patch-include_cdio++_iso9660.hpp) = 73bd86ecfa0c728eab231bce36317ab7f616fa4c
 9SHA1 (patch-lib_driver_logging.c) = ec74ea317c82737954eb0d66e64810487ed1f222
File Deleted: pkgsrc/misc/libcdio/patches/Attic/patch-aa
File Deleted: pkgsrc/misc/libcdio/patches/Attic/patch-ab
File Added: pkgsrc/misc/libcdio/patches/patch-configure
$NetBSD: patch-configure,v 1.1 2019/04/29 17:22:04 adam Exp $

cdda-player works fine on NetBSD.

--- configure.orig	2019-04-29 15:14:42.000000000 +0000
+++ configure
@@ -18229,7 +18229,6 @@ $as_echo "#define HAVE_NETBSD_CDROM 1" >
 
  	# LIBS="$LIBS -lcam"
   	cd_drivers="${cd_drivers}, NetBSD "
-	enable_cdda_player="no"
 	;;
      os2*)
File Added: pkgsrc/misc/libcdio/patches/patch-include_cdio++_iso9660.hpp
$NetBSD: patch-include_cdio++_iso9660.hpp,v 1.1 2019/04/29 17:22:04 adam Exp $

Work around namespace pollution on OpenSolaris (PR 43638, Aleksey Cheusov)

--- include/cdio++/iso9660.hpp.orig	2008-11-29 04:52:43.000000000 +0000
+++ include/cdio++/iso9660.hpp
@@ -33,6 +33,10 @@
 #include <cstring>
 using namespace std;
 
+#ifdef FS
+#undef FS
+#endif
+
 /** ISO 9660 class.
 */
 class ISO9660
File Added: pkgsrc/misc/libcdio/patches/patch-lib_driver_logging.c
$NetBSD: patch-lib_driver_logging.c,v 1.1 2019/04/29 17:22:04 adam Exp $

Do not exit() on error.

--- lib/driver/logging.c.orig	2018-08-12 16:33:48.000000000 +0000
+++ lib/driver/logging.c
@@ -49,7 +49,6 @@ cdio_default_log_handler(cdio_log_level_
         fprintf (stderr, "**ERROR: %s\n", message);
         fflush (stderr);
       }
-      exit (EXIT_FAILURE);
       break;
     case CDIO_LOG_DEBUG:
       if (level >= cdio_loglevel_default) {