CVS commit: pkgsrc/audio/moc

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Feb 19 16:55:16 UTC 2025

Modified Files:
        pkgsrc/audio/moc: Makefile
Added Files:
        pkgsrc/audio/moc/patches: patch-decoder__plugins_ffmpeg_ffmpeg.c

Log Message:
moc: switch to ffmpeg4


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/audio/moc/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/moc/patches/patch-decoder__plugins_ffmpeg_ffmpeg.c

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

Modified files:

Index: pkgsrc/audio/moc/Makefile
diff -u pkgsrc/audio/moc/Makefile:1.70 pkgsrc/audio/moc/Makefile:1.71
--- pkgsrc/audio/moc/Makefile:1.70      Wed Feb 12 06:44:26 2025
+++ pkgsrc/audio/moc/Makefile   Wed Feb 19 16:55:16 2025
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.70 2025/02/12 06:44:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.71 2025/02/19 16:55:16 adam Exp $
 
-DISTNAME=              moc-2.5.2
-PKGREVISION=           31
-CATEGORIES=            audio
-MASTER_SITES=          http://ftp.daper.net/pub/soft/moc/stable/
-EXTRACT_SUFX=          .tar.bz2
-
-MAINTAINER=            peter.schuller%infidyne.com@localhost
-HOMEPAGE=              https://moc.daper.net/
-COMMENT=               Curses based console audio player
-LICENSE=               gnu-gpl-v2
+DISTNAME=      moc-2.5.2
+PKGREVISION=   31
+CATEGORIES=    audio
+MASTER_SITES=  http://ftp.daper.net/pub/soft/moc/stable/
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    peter.schuller%infidyne.com@localhost
+HOMEPAGE=      https://moc.daper.net/
+COMMENT=       Curses based console audio player
+LICENSE=       gnu-gpl-v2
 
 GNU_CONFIGURE=         yes
 USE_PKGLOCALEDIR=      yes

Added files:

Index: pkgsrc/audio/moc/patches/patch-decoder__plugins_ffmpeg_ffmpeg.c
diff -u /dev/null pkgsrc/audio/moc/patches/patch-decoder__plugins_ffmpeg_ffmpeg.c:1.1
--- /dev/null   Wed Feb 19 16:55:16 2025
+++ pkgsrc/audio/moc/patches/patch-decoder__plugins_ffmpeg_ffmpeg.c     Wed Feb 19 16:55:16 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-decoder__plugins_ffmpeg_ffmpeg.c,v 1.1 2025/02/19 16:55:16 adam Exp $
+
+Fix build with FFmpeg 4.
+
+--- decoder_plugins/ffmpeg/ffmpeg.c.orig       2025-02-19 16:02:01.187401861 +0000
++++ decoder_plugins/ffmpeg/ffmpeg.c
+@@ -993,8 +993,8 @@ static void *ffmpeg_open (const char *fi
+ #endif
+ 
+       set_downmixing (data);
+-      if (data->codec->capabilities & CODEC_CAP_TRUNCATED)
+-              data->enc->flags |= CODEC_FLAG_TRUNCATED;
++      if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++              data->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
+ 
+ #ifdef HAVE_AVCODEC_OPEN2
+       if (avcodec_open2 (data->enc, data->codec, NULL) < 0)
+@@ -1025,7 +1025,7 @@ static void *ffmpeg_open (const char *fi
+ 
+       data->sample_width = sfmt_Bps (data->fmt);
+ 
+-      if (data->codec->capabilities & CODEC_CAP_DELAY)
++      if (data->codec->capabilities & AV_CODEC_CAP_DELAY)
+               data->delay = true;
+       data->seek_broken = is_seek_broken (data);
+       data->timing_broken = is_timing_broken (data->ic);