moc: update to 2.6-alpha3

multimedia/moc/Portfile

@@ -3,8 +3,8 @@
 PortSystem          1.0
 
 name                moc
-version             2.6-alpha1
-revision            8
+version             2.6-alpha3
+revision            9
 license             GPL-2
 categories          multimedia
 maintainers         nomaintainer
@@ -20,38 +20,67 @@ long_description    MOC (music on console) is a console audio player for LINUX/U
 homepage            http://moc.daper.net
 master_sites        http://ftp.daper.net/pub/soft/moc/unstable/
 
-checksums           rmd160  283f9945abbd3b3d4e15f23485228c00983edfe8 \
-                    sha256  0b0a3515c65b4c47a250e350c663535778239352db859921f5d564ed727a0bbc \
-                    size    491660
+checksums           rmd160  d56a53b67438d397f309a1e07f42ac3b4b3550be \
+                    sha256  a27b8888984cf8dbcd758584961529ddf48c237caa9b40b67423fbfbb88323b1 \
+                    size    496676
 
 use_xz              yes
 
-configure.cflags-append \
-                    -D_DARWIN_C_SOURCE
-
-depends_build       port:pkgconfig
+depends_build-append \
+                    path:bin/pkg-config:pkgconfig
 
-depends_lib         port:libiconv \
-                    port:ncurses \
-                    path:lib/libavcodec.dylib:ffmpeg \
-                    port:libmad \
-                    port:mpc \
+depends_lib-append  port:curl \
+                    port:faad2 \
+                    port:ffmpeg \
+                    port:flac \
+                    port:jack \
+                    port:libiconv \
                     port:libid3tag \
+                    port:libmad \
+                    port:libmagic \
+                    port:libmodplug \
+                    port:libmpcdec \
                     port:libsamplerate \
+                    port:libsndfile \
+                    port:ncurses \
+                    port:popt \
                     path:lib/libspeex.dylib:speex \
                     port:taglib \
-                    port:flac \
-                    port:jack \
-                    port:faad2 \
-                    port:curl
+                    port:wavpack
 
-patchfiles          patch-ffmpeg-3.0.diff \
-                    patch-ffmpeg-4.0.diff
+patchfiles          patch-ffmpeg-4.0.diff
 
 use_autoreconf      yes
 autoreconf.args     -fvi
 
-configure.args      --with-jack --without-vorbis --disable-cache
+configure.args-append \
+                    --disable-cache \
+                    --with-jack \
+                    --without-sidplay2 \
+                    --without-vorbis
+
+configure.cflags-append \
+                    -D_DARWIN_C_SOURCE
+
+# Old jack1 requires Berkley DB, and unless moc
+# is pointed to it, the build fails:
+# Undefined symbols: "_db_strerror"
+if {${configure.cxx_stdlib} ne "libc++"} {
+    set bdb_v       60
+
+    depends_lib-append \
+                    port:db${bdb_v}
+
+    # Configure arg is there, but does not really work.
+    configure.args-append \
+                    --with-bdb-dir=${prefix}/lib/db${bdb_v}
+
+    # So we need explicit flags:
+    configure.cflags-append \
+                    -I${prefix}/include/db${bdb_v}
+    configure.ldflags-append \
+                    -L${prefix}/lib/db${bdb_v} -ldb
+}
 
 #default_variants    +autojack
 

multimedia/moc/files/patch-ffmpeg-4.0.diff

@@ -1,6 +1,6 @@
---- decoder_plugins/ffmpeg/ffmpeg.c.orig	2018-04-24 22:21:11.000000000 -0700
-+++ decoder_plugins/ffmpeg/ffmpeg.c	2018-04-24 22:21:59.000000000 -0700
-@@ -895,7 +895,7 @@
+--- decoder_plugins/ffmpeg/ffmpeg.c.orig	2016-11-16 08:29:51.000000000 +0800
++++ decoder_plugins/ffmpeg/ffmpeg.c	2024-11-28 22:23:23.000000000 +0800
+@@ -697,7 +697,7 @@
  	 * FFmpeg/LibAV in use.  For some versions this will be caught in
  	 * *_find_stream_info() above and misreported as an unfound codec
  	 * parameters error. */
@@ -9,7 +9,7 @@
  		decoder_error (&data->error, ERROR_FATAL, 0,
  				"The codec is experimental and may damage MOC: %s",
  				data->codec->name);
-@@ -903,8 +903,8 @@
+@@ -705,8 +705,8 @@
  	}
 
  	set_downmixing (data);
@@ -18,9 +18,9 @@
 +	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)
-@@ -930,7 +930,7 @@
+ 	{
+@@ -725,7 +725,7 @@
 
  	data->sample_width = sfmt_Bps (data->fmt);