CVS commit: pkgsrc/multimedia/transcode

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia/transcode
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Tue, 14 Jul 2026 04:57:00 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jul 14 04:57:00 UTC 2026

Modified Files:
        pkgsrc/multimedia/transcode: distinfo
        pkgsrc/multimedia/transcode/patches: patch-configure
            patch-export_aud__aux.c patch-export_export_ffmpeg.c

Log Message:
transcode: fix build with lame 4.0

regen some other patches while here


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/multimedia/transcode/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/transcode/patches/patch-configure \
    pkgsrc/multimedia/transcode/patches/patch-export_export_ffmpeg.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/multimedia/transcode/patches/patch-export_aud__aux.c

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/distinfo
diff -u pkgsrc/multimedia/transcode/distinfo:1.31 pkgsrc/multimedia/transcode/distinfo:1.32
--- pkgsrc/multimedia/transcode/distinfo:1.31   Mon Oct 13 03:21:20 2025
+++ pkgsrc/multimedia/transcode/distinfo        Tue Jul 14 04:56:59 2026
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.31 2025/10/13 03:21:20 mrg Exp $
+$NetBSD: distinfo,v 1.32 2026/07/14 04:56:59 wiz Exp $
 
 BLAKE2s (transcode-1.1.7.tar.bz2) = 4277b13f37bd4389c768e60a6d359791c53713b72b3a108fc82e4958fdb2c9a3
 SHA512 (transcode-1.1.7.tar.bz2) = d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f
 Size (transcode-1.1.7.tar.bz2) = 2183627 bytes
 SHA1 (patch-avilib_avidump.c) = 640aac6fc274a685b1847b48870b37b2c2ab1e88
-SHA1 (patch-configure) = 62d789f7408b27daa07402934d17303082e78f75
+SHA1 (patch-configure) = cba474cbad747c07a0050626466b5a4e814b9601
 SHA1 (patch-encode_encode_lavc.c) = 5ce01220933d58ab09a58c37146da290a3d91164
-SHA1 (patch-export_aud__aux.c) = 437ffde84123eccfe496c478a9db0066208fe256
+SHA1 (patch-export_aud__aux.c) = 4ce03bfde60db23618ca6619e6a0098269230eef
 SHA1 (patch-export_export__im.c) = 3a4f08d548cdebdfa618aeff2df398bd61002120
-SHA1 (patch-export_export_ffmpeg.c) = 2cc6100ab5e837b8d3fe66ec55c88962e6fbfb26
+SHA1 (patch-export_export_ffmpeg.c) = 9f0f40ecd170eb7a122ca8af2b96ad0e6963c4e1
 SHA1 (patch-export_ffmpeg_cfg.c) = d1678b2b6bdd2a9353d1fb34d72c2cc2d1aa1fa4
 SHA1 (patch-export_ffmpeg_cfg.h) = 7cf230de948de004cc0500f0ae2511561081e952
 SHA1 (patch-filter_Makefile.am) = 1df76fb2c399f1dff5b7e2f328458b2f248d2488

Index: pkgsrc/multimedia/transcode/patches/patch-configure
diff -u pkgsrc/multimedia/transcode/patches/patch-configure:1.3 pkgsrc/multimedia/transcode/patches/patch-configure:1.4
--- pkgsrc/multimedia/transcode/patches/patch-configure:1.3     Thu Nov 16 23:54:31 2023
+++ pkgsrc/multimedia/transcode/patches/patch-configure Tue Jul 14 04:56:59 2026
@@ -1,13 +1,14 @@
-$NetBSD: patch-configure,v 1.3 2023/11/16 23:54:31 mrg Exp $
+$NetBSD: patch-configure,v 1.4 2026/07/14 04:56:59 wiz Exp $
 
 Fixes for ImageMagic v7.
 Add DragonFly support.
 Make use of PTHREAD_LDFLAGS.
 Portability fix.
+Remove lame version check, lame 4 reports '40' < '393'
 
---- configure.orig     2011-11-19 10:50:37.000000000 -0600
-+++ configure  2023-11-16 17:52:19.858940713 -0600
-@@ -1868,7 +1868,7 @@
+--- configure.orig     2011-11-19 16:50:37.000000000 +0000
++++ configure
+@@ -1868,7 +1868,7 @@ Optional Packages:
    --with-imagemagick-prefix=PFX
                            prefix where imagemagick is installed (/usr)
    --with-imagemagick-includes=DIR
@@ -16,7 +17,7 @@ Portability fix.
                            are installed (/usr/include)
    --with-imagemagick-libs=DIR
                            directory where imagemagick libraries (libnone.so)
-@@ -5096,7 +5096,7 @@
+@@ -5096,7 +5096,7 @@ $as_echo "#define OS_LINUX 1" >>confdefs.h
  $as_echo "#define OS_LINUX 1" >>confdefs.h
  
      ;;
@@ -25,7 +26,7 @@ Portability fix.
      is_bsd=yes
  
  $as_echo "#define OS_BSD 1" >>confdefs.h
-@@ -19431,7 +19431,7 @@
+@@ -19431,7 +19431,7 @@ if test -n "$PTHREAD_LIBS" ; then
  esac
  # let user override
  if test -n "$PTHREAD_LIBS" ; then
@@ -34,7 +35,38 @@ Portability fix.
  fi
  if test -n "$PTHREAD_CFLAGS" ; then
    pthread_cflags="$PTHREAD_CFLAGS"
-@@ -27651,7 +27651,7 @@
+@@ -23318,30 +23318,8 @@ fi
+   CFLAGS="$ac_save_CFLAGS"
+   LIBS="$ac_save_LIBS"
+ 
+-  if test 393 -ge "$lame_version" ; then
+-    have_lame="no"
+-
+-this_pkg_err="yes"
+-if test x"yes" != x"optional" ; then
+-  tc_pkg_err="yes"
+-
+-  prob=""
+-  if test x"yes" = x"required" ; then
+-    prob="requirement failed"
+-  else
+-    prob="option '--enable-lame' failed"
+-  fi
+-  msg="ERROR: $prob: lame version < 3.93
+-lame.h can be found in the following packages:
+-  lame  http://www.mp3dev.org/
+-
+-"
+-  tc_pkg_err_text="$tc_pkg_err_text$msg"
+ fi
+ 
+-  fi
+-fi
+-
+ if test x"$have_lame" = x"yes" ; then
+ 
+ $as_echo "#define HAVE_LAME 1" >>confdefs.h
+@@ -27651,7 +27629,7 @@ $as_echo_n "checking for pkgconfig support for imagema
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkgconfig support for imagemagick" >&5
  $as_echo_n "checking for pkgconfig support for imagemagick... " >&6; }
    if test x"$PKG_CONFIG" != x"no" ; then
@@ -43,7 +75,7 @@ Portability fix.
        pkg_config_imagemagick="yes"
      fi
    fi
-@@ -27720,7 +27720,7 @@
+@@ -27720,7 +27698,7 @@ $as_echo "user" >&6; }
  $as_echo "user" >&6; }
    else
      if test x"$pkg_config_imagemagick" != x"no" ; then
@@ -52,7 +84,7 @@ Portability fix.
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: pkg-config" >&5
  $as_echo "pkg-config" >&6; }
      else
-@@ -27753,12 +27753,12 @@
+@@ -27753,12 +27731,12 @@ $as_echo "default" >&6; }
    IMAGEMAGICK_EXTRA_CFLAGS="$IMAGEMAGICK_EXTRA_CFLAGS $xi"
    IMAGEMAGICK_EXTRA_CFLAGS="`echo $IMAGEMAGICK_EXTRA_CFLAGS | sed -e 's/  */ /g'`"
  
@@ -69,7 +101,7 @@ Portability fix.
  else
  
  this_pkg_err="yes"
-@@ -27771,8 +27771,8 @@
+@@ -27771,8 +27749,8 @@ if test x"no" != x"optional" ; then
    else
      prob="option '--enable-imagemagick' failed"
    fi
@@ -80,7 +112,7 @@ Portability fix.
    Wand  http://www.imagemagick.org/
  
  "
-@@ -27784,7 +27784,7 @@
+@@ -27784,7 +27762,7 @@ fi
  
      CPPFLAGS="$save_CPPFLAGS"
    elif test x"$pkg_config_imagemagick" != x"no" ; then
@@ -89,7 +121,7 @@ Portability fix.
    fi
  
    # get and test the _LIBS
-@@ -27797,7 +27797,7 @@
+@@ -27797,7 +27775,7 @@ $as_echo "user" >&6; }
  $as_echo "user" >&6; }
    else
      if test x"$pkg_config_imagemagick" != x"no" ; then
@@ -98,7 +130,7 @@ Portability fix.
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: pkg-config" >&5
  $as_echo "pkg-config" >&6; }
      else
-@@ -27900,7 +27900,7 @@
+@@ -27900,7 +27878,7 @@ fi
  
      LDFLAGS="$save_LDFLAGS"
    elif test x"$pkg_config_imagemagick" != x"no" ; then
@@ -107,7 +139,7 @@ Portability fix.
    fi
  
    if test x"$this_pkg_err" = x"no" ; then
-@@ -29507,7 +29507,7 @@
+@@ -29507,7 +29485,7 @@ if test "${enable_nuv+set}" = set; then :
      yes) if test yes != "$have_lzo"; then
             as_fn_error $? "liblzo2 is required for NuppelVideo support, try --enable-lzo" "$LINENO" 5
           fi
Index: pkgsrc/multimedia/transcode/patches/patch-export_export_ffmpeg.c
diff -u pkgsrc/multimedia/transcode/patches/patch-export_export_ffmpeg.c:1.3 pkgsrc/multimedia/transcode/patches/patch-export_export_ffmpeg.c:1.4
--- pkgsrc/multimedia/transcode/patches/patch-export_export_ffmpeg.c:1.3        Sun Dec 29 10:23:53 2019
+++ pkgsrc/multimedia/transcode/patches/patch-export_export_ffmpeg.c    Tue Jul 14 04:56:59 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-export_export_ffmpeg.c,v 1.3 2019/12/29 10:23:53 markd Exp $
+$NetBSD: patch-export_export_ffmpeg.c,v 1.4 2026/07/14 04:56:59 wiz Exp $
 
 Fixes building against FFmpeg version >= 4.0.0 (gentoo patch).
 
 --- export/export_ffmpeg.c.orig        2011-11-19 16:50:27.000000000 +0000
 +++ export/export_ffmpeg.c
-@@ -122,6 +122,7 @@ static uint8_t             *img_buffer =
+@@ -122,6 +122,7 @@ static AVCodec             *lavc_venc_codec = NULL;
  static AVFrame             *lavc_convert_frame = NULL;
  
  static AVCodec             *lavc_venc_codec = NULL;
@@ -12,7 +12,7 @@ Fixes building against FFmpeg version >=
  static AVFrame             *lavc_venc_frame = NULL;
  static AVCodecContext      *lavc_venc_context;
  static avi_t               *avifile = NULL;
-@@ -180,7 +181,7 @@ static char *tc_strchrnul(const char *s,
+@@ -180,7 +181,7 @@ static char *tc_strchrnul(const char *s, int c) {
  
  
  /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
@@ -21,7 +21,7 @@ Fixes building against FFmpeg version >=
  #include <libavutil/avstring.h>
  #include <libswscale/swscale.h>
  
-@@ -249,9 +250,9 @@ int opt_default(const char *opt, const c
+@@ -249,9 +250,9 @@ int opt_default(const char *opt, const char *arg){
      for(type=0; type<AVMEDIA_TYPE_NB && ret>= 0; type++){
                /* GLUE: +if */
                if (type == AVMEDIA_TYPE_VIDEO) {
@@ -34,7 +34,7 @@ Fixes building against FFmpeg version >=
                /* GLUE: +if */
                }
      }
-@@ -266,7 +267,10 @@ int opt_default(const char *opt, const c
+@@ -266,7 +267,10 @@ int opt_default(const char *opt, const char *arg){
          if(opt[0] == 'a')
              ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o);
          else */ if(opt[0] == 'v')
@@ -283,8 +283,8 @@ Fixes building against FFmpeg version >=
      }
  
 -    lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
--
  
+-
        /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
 -      if (lavc_param_video_preset) {
 +      if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
@@ -298,7 +298,7 @@ Fixes building against FFmpeg version >=
 +    if (lavc_param_scan_offset) {
 +      av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0);
 +    }
-+
+ 
 +    if (lavc_param_ss) {
 +      av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0);
 +    }
@@ -314,7 +314,7 @@ Fixes building against FFmpeg version >=
 +    if (lavc_param_data_partitioning) {
 +      av_dict_set(&lavc_venc_opts, "vdpart", "1", 0);
 +    }
- 
++
      //-- open codec --
      //----------------
      TC_LOCK_LIBAVCODEC;
@@ -370,7 +370,7 @@ Fixes building against FFmpeg version >=
                             lavc_venc_context->height);
            ac_imgconvert(&param->buffer, IMG_RGB_DEFAULT,
                                lavc_venc_frame->data, IMG_YUV420P,
-@@ -1652,13 +1682,17 @@ MOD_encode
+@@ -1652,12 +1682,16 @@ MOD_encode
                return TC_EXPORT_ERROR;
      }
  
@@ -385,9 +385,8 @@ Fixes building against FFmpeg version >=
 +    ret = avcodec_encode_video2(lavc_venc_context, &pkt,
 +                                    lavc_venc_frame, &got_packet);
      TC_UNLOCK_LIBAVCODEC;
- 
-+    out_size = ret ? ret : pkt.size;
 +
++    out_size = ret ? ret : pkt.size;
+ 
      if (out_size < 0) {
        tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size);
-       return TC_EXPORT_ERROR;

Index: pkgsrc/multimedia/transcode/patches/patch-export_aud__aux.c
diff -u pkgsrc/multimedia/transcode/patches/patch-export_aud__aux.c:1.2 pkgsrc/multimedia/transcode/patches/patch-export_aud__aux.c:1.3
--- pkgsrc/multimedia/transcode/patches/patch-export_aud__aux.c:1.2     Sun Dec 29 10:23:53 2019
+++ pkgsrc/multimedia/transcode/patches/patch-export_aud__aux.c Tue Jul 14 04:56:59 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-export_aud__aux.c,v 1.2 2019/12/29 10:23:53 markd Exp $
+$NetBSD: patch-export_aud__aux.c,v 1.3 2026/07/14 04:56:59 wiz Exp $
 
 Fixes building against FFmpeg version >= 4.0.0 (gentoo patch).
 
 --- export/aud_aux.c.orig      2011-11-19 16:50:27.000000000 +0000
 +++ export/aud_aux.c
-@@ -326,10 +326,10 @@ static int tc_audio_init_ffmpeg(vob_t *v
+@@ -326,10 +326,10 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_code
  
      switch (o_codec) {
        case   0x50:
@@ -17,7 +17,7 @@ Fixes building against FFmpeg version >=
          break;
        default:
          tc_warn("cannot init ffmpeg with %x", o_codec);
-@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
+@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_code
  
      //-- set parameters (bitrate, channels and sample-rate) --
      //--------------------------------------------------------
@@ -26,7 +26,7 @@ Fixes building against FFmpeg version >=
  #if LIBAVCODEC_VERSION_MAJOR < 53
      mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
  #else
-@@ -359,11 +359,11 @@ static int tc_audio_init_ffmpeg(vob_t *v
+@@ -359,11 +359,11 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_code
      //-- open codec --
      //----------------
      TC_LOCK_LIBAVCODEC;
@@ -40,7 +40,7 @@ Fixes building against FFmpeg version >=
          return(TC_EXPORT_ERROR);
      }
  
-@@ -846,6 +846,9 @@ static int tc_audio_encode_ffmpeg(char *
+@@ -846,6 +846,9 @@ static int tc_audio_encode_ffmpeg(char *aud_buffer, in
  #ifdef HAVE_FFMPEG
      int  in_size, out_size;
      char *in_buf;
@@ -50,7 +50,7 @@ Fixes building against FFmpeg version >=
  
      //-- input buffer and amount of bytes --
      in_size = aud_size;
-@@ -866,10 +869,14 @@ static int tc_audio_encode_ffmpeg(char *
+@@ -866,10 +869,14 @@ static int tc_audio_encode_ffmpeg(char *aud_buffer, in
  
      ac_memcpy(&mpa_buf[mpa_buf_ptr], in_buf, bytes_needed);
  
@@ -67,7 +67,7 @@ Fixes building against FFmpeg version >=
      tc_audio_write(output, out_size, avifile);
  
          in_size -= bytes_needed;
-@@ -884,6 +891,7 @@ static int tc_audio_encode_ffmpeg(char *
+@@ -884,6 +891,7 @@ static int tc_audio_encode_ffmpeg(char *aud_buffer, in
  
      ac_memcpy(&mpa_buf[mpa_buf_ptr], aud_buffer, bytes_avail);
          mpa_buf_ptr += bytes_avail;
@@ -75,7 +75,7 @@ Fixes building against FFmpeg version >=
          return (0);
        }
      } //bytes availabe from last call?
-@@ -893,10 +901,15 @@ static int tc_audio_encode_ffmpeg(char *
+@@ -893,16 +901,23 @@ static int tc_audio_encode_ffmpeg(char *aud_buffer, in
      //----------------------------------------------------
  
      while (in_size >= mpa_bytes_pf) {
@@ -93,12 +93,11 @@ Fixes building against FFmpeg version >=
  
        tc_audio_write(output, out_size, avifile);
  
-@@ -904,6 +917,8 @@ static int tc_audio_encode_ffmpeg(char *
+       in_size -= mpa_bytes_pf;
        in_buf  += mpa_bytes_pf;
      }
- 
-+    av_frame_free(&frame);
 +
++    av_frame_free(&frame);
+ 
      //-- hold rest of bytes in mpa-buffer --
      //--------------------------------------
-     if (in_size > 0) {

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/games/widelands
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/games/widelands
Indexes:

Home | Main Index | Thread Index | Old Index