Received: by mail.netbsd.org (Postfix, from userid 605) id 1ACAC84D51; Sat, 7 Jan 2023 22:36:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4C5E984D36 for ; Sat, 7 Jan 2023 22:36:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id lW05kM0HETD9 for ; Sat, 7 Jan 2023 22:36:23 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id AC95784D25 for ; Sat, 7 Jan 2023 22:36:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A533BFA90; Sat, 7 Jan 2023 22:36:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1673130983272820" MIME-Version: 1.0 Date: Sat, 7 Jan 2023 22:36:23 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/misc/libcdio To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230107223623.A533BFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1673130983272820 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sat Jan 7 22:36:23 UTC 2023 Modified Files: pkgsrc/misc/libcdio: Makefile distinfo Added Files: pkgsrc/misc/libcdio/patches: patch-src_Makefile.in Log Message: libcdio: fix build on NetBSD with binutils 2.39 To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 pkgsrc/misc/libcdio/Makefile cvs rdiff -u -r1.34 -r1.35 pkgsrc/misc/libcdio/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/misc/libcdio/patches/patch-src_Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1673130983272820 Content-Disposition: inline Content-Length: 2875 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/misc/libcdio/Makefile diff -u pkgsrc/misc/libcdio/Makefile:1.67 pkgsrc/misc/libcdio/Makefile:1.68 --- pkgsrc/misc/libcdio/Makefile:1.67 Tue Jun 28 11:34:48 2022 +++ pkgsrc/misc/libcdio/Makefile Sat Jan 7 22:36:23 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2022/06/28 11:34:48 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2023/01/07 22:36:23 wiz Exp $ DISTNAME= libcdio-2.1.0 PKGREVISION= 5 @@ -25,6 +25,9 @@ PKGCONFIG_OVERRIDE+= libiso9660++.pc.in PKGCONFIG_OVERRIDE+= libudf.pc.in TEST_TARGET= check +# fix linking of cdda_player +MAKE_FLAGS.NetBSD+= CURTERMLIB=-lterminfo + .include "../../audio/libcddb/buildlink3.mk" .include "../../mk/curses.buildlink3.mk" .include "../../devel/popt/buildlink3.mk" Index: pkgsrc/misc/libcdio/distinfo diff -u pkgsrc/misc/libcdio/distinfo:1.34 pkgsrc/misc/libcdio/distinfo:1.35 --- pkgsrc/misc/libcdio/distinfo:1.34 Tue Oct 26 10:59:12 2021 +++ pkgsrc/misc/libcdio/distinfo Sat Jan 7 22:36:23 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.34 2021/10/26 10:59:12 nia Exp $ +$NetBSD: distinfo,v 1.35 2023/01/07 22:36:23 wiz Exp $ BLAKE2s (libcdio-2.1.0.tar.bz2) = 5513848ba888570c7757a1a706126e51da3b252cb93bc5f08159b3a8e45b1a16 SHA512 (libcdio-2.1.0.tar.bz2) = c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f @@ -6,3 +6,4 @@ Size (libcdio-2.1.0.tar.bz2) = 1759040 b SHA1 (patch-configure) = 041105379b760fbd3f710da365b55588320d0ac3 SHA1 (patch-include_cdio++_iso9660.hpp) = 73bd86ecfa0c728eab231bce36317ab7f616fa4c SHA1 (patch-lib_driver_logging.c) = ec74ea317c82737954eb0d66e64810487ed1f222 +SHA1 (patch-src_Makefile.in) = 34a087c9919d487eeae2ffa2885cfd8119d46179 Added files: Index: pkgsrc/misc/libcdio/patches/patch-src_Makefile.in diff -u /dev/null pkgsrc/misc/libcdio/patches/patch-src_Makefile.in:1.1 --- /dev/null Sat Jan 7 22:36:23 2023 +++ pkgsrc/misc/libcdio/patches/patch-src_Makefile.in Sat Jan 7 22:36:23 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_Makefile.in,v 1.1 2023/01/07 22:36:23 wiz Exp $ + +Helper patch for linking against libterminfo when needed. + +--- src/Makefile.in.orig 2023-01-07 19:05:06.747518597 +0000 ++++ src/Makefile.in +@@ -487,7 +487,7 @@ check_programs = $(am__append_1) $(am__a + $(am__append_7) mmc-tool + noinst_HEADERS = cddb.h getopt.h util.h + @BUILD_CDDA_PLAYER_TRUE@cdda_player_SOURCES = cdda-player.c cddb.c cddb.h $(GETOPT_C) +-@BUILD_CDDA_PLAYER_TRUE@cdda_player_LDADD = $(LIBCDIO_LIBS) $(CDDB_LIBS) $(CDDA_PLAYER_LIBS) ++@BUILD_CDDA_PLAYER_TRUE@cdda_player_LDADD = $(LIBCDIO_LIBS) $(CDDB_LIBS) $(CDDA_PLAYER_LIBS) $(CURTERMLIB) + @BUILD_CDDA_PLAYER_TRUE@bin_cdda_player = cdda-player + @BUILD_CD_DRIVE_TRUE@cd_drive_SOURCES = cd-drive.c util.c util.h $(GETOPT_C) + @BUILD_CD_DRIVE_TRUE@cd_drive_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV) --_----------=_1673130983272820--