CVS commit: pkgsrc/misc/libcdio

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Apr 29 17:22:05 UTC 2019

Modified Files:
        pkgsrc/misc/libcdio: Makefile PLIST distinfo
Added Files:
        pkgsrc/misc/libcdio/patches: patch-configure
            patch-include_cdio++_iso9660.hpp patch-lib_driver_logging.c
Removed Files:
        pkgsrc/misc/libcdio/patches: patch-aa patch-ab

Log Message:
libcdio: re-enable cdda-player for NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/misc/libcdio/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/misc/libcdio/PLIST
cvs rdiff -u -r1.30 -r1.31 pkgsrc/misc/libcdio/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/misc/libcdio/patches/patch-aa
cvs rdiff -u -r1.7 -r0 pkgsrc/misc/libcdio/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/libcdio/patches/patch-configure \
    pkgsrc/misc/libcdio/patches/patch-include_cdio++_iso9660.hpp \
    pkgsrc/misc/libcdio/patches/patch-lib_driver_logging.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libcdio/Makefile
diff -u pkgsrc/misc/libcdio/Makefile:1.60 pkgsrc/misc/libcdio/Makefile:1.61
--- pkgsrc/misc/libcdio/Makefile:1.60   Thu Apr 18 17:04:37 2019
+++ pkgsrc/misc/libcdio/Makefile        Mon Apr 29 17:22:04 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2019/04/18 17:04:37 gdt Exp $
+# $NetBSD: Makefile,v 1.61 2019/04/29 17:22:04 adam Exp $
 
 DISTNAME=      libcdio-2.1.0
+PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GNU:=libcdio/}
 EXTRACT_SUFX=  .tar.bz2
@@ -14,15 +15,14 @@ USE_LANGUAGES=              c c++
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake perl:run pkg-config
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --without-versioned-libs
+INFO_FILES=            yes
 PKGCONFIG_OVERRIDE+=   libcdio.pc.in
 PKGCONFIG_OVERRIDE+=   libcdio++.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
-INFO_FILES=            yes
-
 TEST_TARGET=           check
 
 .include "../../audio/libcddb/buildlink3.mk"

Index: pkgsrc/misc/libcdio/PLIST
diff -u pkgsrc/misc/libcdio/PLIST:1.18 pkgsrc/misc/libcdio/PLIST:1.19
--- pkgsrc/misc/libcdio/PLIST:1.18      Thu Apr 18 17:04:37 2019
+++ pkgsrc/misc/libcdio/PLIST   Mon Apr 29 17:22:04 2019
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.18 2019/04/18 17:04:37 gdt Exp $
+@comment $NetBSD: PLIST,v 1.19 2019/04/29 17:22:04 adam Exp $
 bin/cd-drive
 bin/cd-info
 bin/cd-read
+bin/cdda-player
 bin/iso-info
 bin/iso-read
 bin/mmc-tool

Index: pkgsrc/misc/libcdio/distinfo
diff -u pkgsrc/misc/libcdio/distinfo:1.30 pkgsrc/misc/libcdio/distinfo:1.31
--- pkgsrc/misc/libcdio/distinfo:1.30   Thu Apr 18 17:04:37 2019
+++ pkgsrc/misc/libcdio/distinfo        Mon Apr 29 17:22:04 2019
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.30 2019/04/18 17:04:37 gdt Exp $
+$NetBSD: distinfo,v 1.31 2019/04/29 17:22:04 adam Exp $
 
 SHA1 (libcdio-2.1.0.tar.bz2) = ec22e5168bc0dcfc179ec7b1164af1e5b672ca89
 RMD160 (libcdio-2.1.0.tar.bz2) = 6b0e4917cd2dd5cac0b7afdb70789bf0ad2aed79
 SHA512 (libcdio-2.1.0.tar.bz2) = c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
 Size (libcdio-2.1.0.tar.bz2) = 1759040 bytes
-SHA1 (patch-aa) = 8e70ee2840c19da3efc0c47dfa9f7ea400a1ec2e
-SHA1 (patch-ab) = 73bd86ecfa0c728eab231bce36317ab7f616fa4c
+SHA1 (patch-configure) = ef72517e444df4834608d152f5e9ce625297d64e
+SHA1 (patch-include_cdio++_iso9660.hpp) = 73bd86ecfa0c728eab231bce36317ab7f616fa4c
+SHA1 (patch-lib_driver_logging.c) = ec74ea317c82737954eb0d66e64810487ed1f222

Added files:

Index: pkgsrc/misc/libcdio/patches/patch-configure
diff -u /dev/null pkgsrc/misc/libcdio/patches/patch-configure:1.1
--- /dev/null   Mon Apr 29 17:22:05 2019
+++ pkgsrc/misc/libcdio/patches/patch-configure Mon Apr 29 17:22:04 2019
@@ -0,0 +1,14 @@
+$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*)
+ 
Index: pkgsrc/misc/libcdio/patches/patch-include_cdio++_iso9660.hpp
diff -u /dev/null pkgsrc/misc/libcdio/patches/patch-include_cdio++_iso9660.hpp:1.1
--- /dev/null   Mon Apr 29 17:22:05 2019
+++ pkgsrc/misc/libcdio/patches/patch-include_cdio++_iso9660.hpp        Mon Apr 29 17:22:04 2019
@@ -0,0 +1,17 @@
+$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
Index: pkgsrc/misc/libcdio/patches/patch-lib_driver_logging.c
diff -u /dev/null pkgsrc/misc/libcdio/patches/patch-lib_driver_logging.c:1.1
--- /dev/null   Mon Apr 29 17:22:05 2019
+++ pkgsrc/misc/libcdio/patches/patch-lib_driver_logging.c      Mon Apr 29 17:22:04 2019
@@ -0,0 +1,14 @@
+$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) {