Date: Tue, 30 Dec 2025 12:00:14 +0000 From: Jason E. Hale <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: adb35b4f2e40 - main - sysutils/cdrdao: Update to 1.2.6 Message-ID: <6953bece.3680c.54adb30d@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=adb35b4f2e4055f3083fc0ac79aa2200246c8a3c commit adb35b4f2e4055f3083fc0ac79aa2200246c8a3c Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2025-12-30 00:57:43 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2025-12-30 12:00:04 +0000 sysutils/cdrdao: Update to 1.2.6 Remove USES=alias, which should be removed completely. This was a helper for DragonFly, but it's horribly outdated. https://github.com/cdrdao/cdrdao/releases/tag/rel_1_2_6 --- sysutils/cdrdao/Makefile | 10 ++++------ sysutils/cdrdao/distinfo | 6 +++--- sysutils/cdrdao/files/patch-configure.ac | 6 +++--- sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc | 13 ++++--------- sysutils/cdrdao/files/patch-dao_cdrdao.man | 8 ++++---- sysutils/cdrdao/files/patch-dao_main.cc | 4 ++-- 6 files changed, 20 insertions(+), 27 deletions(-) diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile index 249275b8ba97..a241c4f7ef41 100644 --- a/sysutils/cdrdao/Makefile +++ b/sysutils/cdrdao/Makefile @@ -1,6 +1,5 @@ PORTNAME= cdrdao -DISTVERSION= 1_2_5 -PORTREVISION= 2 +DISTVERSION= 1_2_6 CATEGORIES= sysutils audio MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/rel_${DISTVERSION}/ \ SF/${PORTNAME}/rel_${DISTVERSION} @@ -13,9 +12,8 @@ WWW= https://cdrdao.sourceforge.net/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= alias autoreconf compiler:c++11-lang gettext-tools gmake iconv \ +USES= autoreconf compiler:c++14-lang gettext-tools gmake iconv \ localbase tar:bzip2 -USE_CXXSTD= c++11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gcdmaster=no \ @@ -28,10 +26,10 @@ OPTIONS_DEFINE= DOCS TOC2MP3 MP3OGG OPTIONS_DEFAULT= MP3OGG OPTIONS_SUB= yes -MP3OGG_DESC= Build with MP3/Ogg support (for sysutils/gcdmaster) +MP3OGG_DESC= Build with MP3/Ogg MP3OGG_LIB_DEPENDS= libao.so:audio/libao \ libmad.so:audio/libmad \ - libvorbis.so:audio/libvorbis + libvorbisfile.so:audio/libvorbis MP3OGG_USES= pkgconfig MP3OGG_CONFIGURE_OFF= --with-mp3-support=no --with-ogg-support=no diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo index f49c74ebe392..bb7d0d854183 100644 --- a/sysutils/cdrdao/distinfo +++ b/sysutils/cdrdao/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687630406 -SHA256 (cdrdao-1.2.5.tar.bz2) = d19b67c853c5dba2406afaab6cd788e77f35eebe634cac4679528477c7be01b6 -SIZE (cdrdao-1.2.5.tar.bz2) = 870084 +TIMESTAMP = 1766916937 +SHA256 (cdrdao-1.2.6.tar.bz2) = 0cf29e1183ffd8e4d167c403d7a6ea2109a2dd4cd97e61f80417cf1373220ff4 +SIZE (cdrdao-1.2.6.tar.bz2) = 851644 diff --git a/sysutils/cdrdao/files/patch-configure.ac b/sysutils/cdrdao/files/patch-configure.ac index 0c886722dd1e..271db14b218a 100644 --- a/sysutils/cdrdao/files/patch-configure.ac +++ b/sysutils/cdrdao/files/patch-configure.ac @@ -1,9 +1,9 @@ Remove redundant check for libao which causes it to always be required even if mp3 and ogg support are disabled. ---- configure.ac.orig 2023-02-03 14:46:06 UTC +--- configure.ac.orig 2025-12-05 11:17:35 UTC +++ configure.ac -@@ -314,8 +314,10 @@ dnl Check for libao +@@ -319,8 +319,10 @@ dnl Check for libao esac dnl Check for libao @@ -14,7 +14,7 @@ mp3 and ogg support are disabled. dnl Check for OGG support if test "$with_ogg_support" = yes; then -@@ -339,12 +341,6 @@ if test "$with_mp3_support" = yes; then +@@ -344,12 +346,6 @@ if test "$with_mp3_support" = yes; then echo "MP3 support disabled"; with_mp3_support=no fi fi diff --git a/sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc b/sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc index 6b39efbe9ab9..3328c4f8656d 100644 --- a/sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc +++ b/sysutils/cdrdao/files/patch-dao_ScsiIf-freebsd-cam.cc @@ -1,13 +1,8 @@ ---- dao/ScsiIf-freebsd-cam.cc.orig 2023-01-25 14:30:35 UTC +--- dao/ScsiIf-freebsd-cam.cc.orig 2025-12-05 11:17:35 UTC +++ dao/ScsiIf-freebsd-cam.cc -@@ -112,11 +112,11 @@ int ScsiIf::sendCmd(const unsigned char *cmd, int cmdL - { - int retval; - int flags = CAM_DIR_NONE; -- u_int8_t * data_ptr; -- size_t data_len; -+ u_int8_t * data_ptr = NULL; -+ size_t data_len = 0; +@@ -115,8 +115,8 @@ int ScsiIf::sendCmd(const unsigned char *cmd, int cmdL + u_int8_t * data_ptr = NULL; + size_t data_len = 0; - bzero(impl_->ccb, sizeof(union ccb)); - bcopy(cmd, &impl_->ccb->csio.cdb_io.cdb_bytes, cmdLen); diff --git a/sysutils/cdrdao/files/patch-dao_cdrdao.man b/sysutils/cdrdao/files/patch-dao_cdrdao.man index 625e0afa497b..b2b908d3050c 100644 --- a/sysutils/cdrdao/files/patch-dao_cdrdao.man +++ b/sysutils/cdrdao/files/patch-dao_cdrdao.man @@ -1,6 +1,6 @@ ---- dao/cdrdao.man.orig 2018-05-16 10:46:39 UTC +--- dao/cdrdao.man.orig 2025-12-05 11:17:35 UTC +++ dao/cdrdao.man -@@ -798,15 +798,11 @@ following locations. The files will be read on startup +@@ -799,15 +799,11 @@ in that order: .I cdrdao in that order: @@ -18,7 +18,7 @@ Command line options will overwrite the loaded settings. The settings file contains name - value pairs separated by a colon. String values must be enclosed by ". The file is -@@ -876,7 +872,7 @@ Directory where temporary WAV files will be created fr +@@ -877,7 +873,7 @@ If the program is terminated during the write/simulati .LP .SH BUGS If the program is terminated during the write/simulation process used IPC @@ -27,7 +27,7 @@ .SH AUTHOR .ft CW .nf -@@ -886,4 +882,4 @@ resources may not be released. Use ipcs(8) and ipcrm(8 +@@ -887,4 +883,4 @@ resources may not be released. Use ipcs(8) and ipcrm(8 .ft R .fi .SH SEE ALSO diff --git a/sysutils/cdrdao/files/patch-dao_main.cc b/sysutils/cdrdao/files/patch-dao_main.cc index 4066ab07e5f6..537ad993af4a 100644 --- a/sysutils/cdrdao/files/patch-dao_main.cc +++ b/sysutils/cdrdao/files/patch-dao_main.cc @@ -1,6 +1,6 @@ ---- dao/main.cc.orig 2023-02-03 14:46:06 UTC +--- dao/main.cc.orig 2025-12-05 11:17:35 UTC +++ dao/main.cc -@@ -2450,11 +2450,7 @@ int main(int argc, char **argv) +@@ -2382,11 +2382,7 @@ int main(int argc, char **argv) Settings* settings = new Settings;help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6953bece.3680c.54adb30d>