CVS commit: pkgsrc/multimedia/transcode

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Mon Oct 13 03:21:20 UTC 2025

Modified Files:
        pkgsrc/multimedia/transcode: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/multimedia/transcode/patches: patch-filter_Makefile.am
            patch-filter_Makefile.in patch-import_mpg123.h

Log Message:
fix build with GCC 14.

GCC 14 revealed several problems with transocde.

the ImageMagick7 port was never complete, and there were missing symbols
that would make the plugins fail to load.  disable these components for
now, until someone spends the time to complete the port.

disable the resample filter which uses APIs removed in ffmpeg4.

provided copies of 2 deprecated lame function prototypes that are always
hidden in lame.h, but are compiled into the library.


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 pkgsrc/multimedia/transcode/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/multimedia/transcode/PLIST
cvs rdiff -u -r1.30 -r1.31 pkgsrc/multimedia/transcode/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/multimedia/transcode/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/transcode/patches/patch-filter_Makefile.am \
    pkgsrc/multimedia/transcode/patches/patch-filter_Makefile.in \
    pkgsrc/multimedia/transcode/patches/patch-import_mpg123.h

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

Modified files:

Index: pkgsrc/multimedia/transcode/Makefile
diff -u pkgsrc/multimedia/transcode/Makefile:1.172 pkgsrc/multimedia/transcode/Makefile:1.173
--- pkgsrc/multimedia/transcode/Makefile:1.172  Sun Sep 21 15:11:42 2025
+++ pkgsrc/multimedia/transcode/Makefile        Mon Oct 13 03:21:20 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.172 2025/09/21 15:11:42 wiz Exp $
+# $NetBSD: Makefile,v 1.173 2025/10/13 03:21:20 mrg Exp $
 
 DISTNAME=      transcode-1.1.7
-PKGREVISION=   89
+PKGREVISION=   90
 CATEGORIES=    multimedia
 MASTER_SITES=  http://bitbucket.org/france/transcode-tcforge/downloads/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/multimedia/transcode/PLIST
diff -u pkgsrc/multimedia/transcode/PLIST:1.19 pkgsrc/multimedia/transcode/PLIST:1.20
--- pkgsrc/multimedia/transcode/PLIST:1.19      Mon May 16 19:41:17 2016
+++ pkgsrc/multimedia/transcode/PLIST   Mon Oct 13 03:21:20 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2016/05/16 19:41:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2025/10/13 03:21:20 mrg Exp $
 bin/avifix
 bin/aviindex
 bin/avimerge
@@ -79,7 +79,6 @@ lib/transcode/filter_null.la
 lib/transcode/filter_pp.la
 ${PLIST.dv}lib/transcode/filter_preview.la
 ${PLIST.x11}lib/transcode/filter_pv.la
-lib/transcode/filter_resample.la
 lib/transcode/filter_skip.la
 lib/transcode/filter_slowmo.la
 lib/transcode/filter_smartbob.la

Index: pkgsrc/multimedia/transcode/distinfo
diff -u pkgsrc/multimedia/transcode/distinfo:1.30 pkgsrc/multimedia/transcode/distinfo:1.31
--- pkgsrc/multimedia/transcode/distinfo:1.30   Thu Nov 16 23:54:31 2023
+++ pkgsrc/multimedia/transcode/distinfo        Mon Oct 13 03:21:20 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2023/11/16 23:54:31 mrg Exp $
+$NetBSD: distinfo,v 1.31 2025/10/13 03:21:20 mrg Exp $
 
 BLAKE2s (transcode-1.1.7.tar.bz2) = 4277b13f37bd4389c768e60a6d359791c53713b72b3a108fc82e4958fdb2c9a3
 SHA512 (transcode-1.1.7.tar.bz2) = d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f
@@ -11,6 +11,8 @@ SHA1 (patch-export_export__im.c) = 3a4f0
 SHA1 (patch-export_export_ffmpeg.c) = 2cc6100ab5e837b8d3fe66ec55c88962e6fbfb26
 SHA1 (patch-export_ffmpeg_cfg.c) = d1678b2b6bdd2a9353d1fb34d72c2cc2d1aa1fa4
 SHA1 (patch-export_ffmpeg_cfg.h) = 7cf230de948de004cc0500f0ae2511561081e952
+SHA1 (patch-filter_Makefile.am) = 1df76fb2c399f1dff5b7e2f328458b2f248d2488
+SHA1 (patch-filter_Makefile.in) = c2ecc2fdf7545c915d06ed72b6547ddc1265027e
 SHA1 (patch-filter_filter__compare.c) = b866aa3f36607bee87aad4eb7023b0e5087b1c25
 SHA1 (patch-filter_filter__logo.c) = 4cff9a4123797d3a25df17b22f3922260ed3a7d4
 SHA1 (patch-filter_filter__logoaway.c) = 252986a1e3ce9969e97bfeedd63bec6e3cf6273c
@@ -21,6 +23,7 @@ SHA1 (patch-import_decode_lavc.c) = 37c1
 SHA1 (patch-import_import__im.c) = 30fdb4ce905c0bdd959964b1455f31823b681e9e
 SHA1 (patch-import_import__imlist.c) = 677ffc2c4ed48ab1e9f4f3f4a28f53b368ae7651
 SHA1 (patch-import_import_ffmpeg.c) = 601ff0f67727c7dc3bdad8c5c43a8b8b4baae5ea
+SHA1 (patch-import_mpg123.h) = e98508ef9157c399d8d77323dfcbcedd91750b7f
 SHA1 (patch-import_nuv_import__nuv.c) = e4a57c29b97b23aed068c06a2ed29dd9e29a9919
 SHA1 (patch-import_probe_ffmpeg.c) = eabbdbc2ffad5da51cb77547ac6a3f92c7bafcdb
 SHA1 (patch-import_probe_im.c) = 27bce069c78e5eee94c14d3f5f03cc14145f85ac

Index: pkgsrc/multimedia/transcode/options.mk
diff -u pkgsrc/multimedia/transcode/options.mk:1.11 pkgsrc/multimedia/transcode/options.mk:1.12
--- pkgsrc/multimedia/transcode/options.mk:1.11 Tue Oct  4 10:31:28 2022
+++ pkgsrc/multimedia/transcode/options.mk      Mon Oct 13 03:21:20 2025
@@ -1,8 +1,14 @@
-# $NetBSD: options.mk,v 1.11 2022/10/04 10:31:28 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2025/10/13 03:21:20 mrg Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.transcode
 PKG_SUPPORTED_OPTIONS= a52 dv faac imagemagick mjpegtools lzo libxml2 x264
-PKG_SUGGESTED_OPTIONS= a52 imagemagick mjpegtools libxml2 x264
+PKG_SUGGESTED_OPTIONS= a52 mjpegtools libxml2 x264
+
+# The ImageMagick 7 port for transcode is incomplete, and GCC 14+ complains
+.include "../../mk/compiler.mk"
+.if empty(CC_VERSION:Mgcc-14.*) && empty(CC_VERSION:Mgcc-15.*)
+PKG_SUGGESTED_OPTIONS+=        imagemagick
+.endif
 
 .include "../../mk/bsd.options.mk"
 

Added files:

Index: pkgsrc/multimedia/transcode/patches/patch-filter_Makefile.am
diff -u /dev/null pkgsrc/multimedia/transcode/patches/patch-filter_Makefile.am:1.1
--- /dev/null   Mon Oct 13 03:21:20 2025
+++ pkgsrc/multimedia/transcode/patches/patch-filter_Makefile.am        Mon Oct 13 03:21:20 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-filter_Makefile.am,v 1.1 2025/10/13 03:21:20 mrg Exp $
+
+Don't build filter_resample - it wants interfaces removed in ffmpeg4.
+
+
+--- filter/Makefile.am.orig    2011-11-19 08:50:27.000000000 -0800
++++ filter/Makefile.am 2025-10-12 14:01:57.331524398 -0700
+@@ -22,7 +22,8 @@ FILTER_LOGOAWAY = filter_logoaway.la
+ endif
+ 
+ if HAVE_FFMPEG
+-FILTER_RESAMPLE = filter_resample.la
++# XXXMRG requires ffmpeg3 interfaces.
++# FILTER_RESAMPLE = filter_resample.la
+ if HAVE_LIBPOSTPROC
+ FILTER_PP = filter_pp.la
+ endif
Index: pkgsrc/multimedia/transcode/patches/patch-filter_Makefile.in
diff -u /dev/null pkgsrc/multimedia/transcode/patches/patch-filter_Makefile.in:1.1
--- /dev/null   Mon Oct 13 03:21:20 2025
+++ pkgsrc/multimedia/transcode/patches/patch-filter_Makefile.in        Mon Oct 13 03:21:20 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-filter_Makefile.in,v 1.1 2025/10/13 03:21:20 mrg Exp $
+
+Don't build filter_resample - it wants interfaces removed in ffmpeg4.
+
+
+--- filter/Makefile.in.orig    2011-11-19 08:50:39.000000000 -0800
++++ filter/Makefile.in 2025-10-12 14:10:47.317045104 -0700
+@@ -689,7 +689,8 @@ pkgdir = $(MOD_PATH)
+ @HAVE_IMAGEMAGICK_TRUE@FILTER_COMPARE = filter_compare.la
+ @HAVE_IMAGEMAGICK_TRUE@FILTER_LOGO = filter_logo.la
+ @HAVE_IMAGEMAGICK_TRUE@FILTER_LOGOAWAY = filter_logoaway.la
+-@HAVE_FFMPEG_TRUE@FILTER_RESAMPLE = filter_resample.la
++# XXXMRG requires ffmpeg3 interfaces.
++@HAVE_FFMPEG_TRUE@# FILTER_RESAMPLE = filter_resample.la
+ @HAVE_FFMPEG_TRUE@@HAVE_LIBPOSTPROC_TRUE@FILTER_PP = filter_pp.la
+ @HAVE_FREETYPE2_TRUE@FILTER_TEXT = filter_text.la
+ @ARCH_X86_TRUE@@HAVE_ASM_MMX_TRUE@@HAVE_ASM_SSE_TRUE@@HAVE_GCC2_FALSE@F_TOMSMOCOMP = tomsmocomp
Index: pkgsrc/multimedia/transcode/patches/patch-import_mpg123.h
diff -u /dev/null pkgsrc/multimedia/transcode/patches/patch-import_mpg123.h:1.1
--- /dev/null   Mon Oct 13 03:21:20 2025
+++ pkgsrc/multimedia/transcode/patches/patch-import_mpg123.h   Mon Oct 13 03:21:20 2025
@@ -0,0 +1,27 @@
+$NetBSD: patch-import_mpg123.h,v 1.1 2025/10/13 03:21:20 mrg Exp $
+
+Copy a couple of deprecated headers from lame.h to fix the GCC 14 build.
+The functions are present in libmp3lame, but not visible in the header
+without patching it directly.
+
+
+--- import/mpg123.h.orig       2011-11-19 08:50:23.000000000 -0800
++++ import/mpg123.h    2025-10-12 20:10:32.047909853 -0700
+@@ -41,6 +41,17 @@ int lame_decode_fromfile(FILE * fd, shor
+ 
+ int buf_probe_mp3(unsigned char *_buf, int len, ProbeTrackInfo *pcm);
+ 
++#ifdef DEPRECATED_OR_OBSOLETE_CODE_REMOVED
++/* XXXMRG - duplicate hidden lame.h stuff. */
++int lame_decode_init(void);
++int lame_decode1_headers(
++        unsigned char*   mp3buf,
++        int              len,
++        short            pcm_l[],
++        short            pcm_r[],
++        mp3data_struct*  mp3data );
++#endif
++
+ #endif  // HAVE_LAME
+ 
+ #endif