Here is an update to MPlayer 20251123.
Mostly just a bunch bug fixes and typo fixes.
Tested on aarch64.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.338
diff -u -p -u -p -r1.338 Makefile
--- Makefile 12 Dec 2025 13:38:22 -0000 1.338
+++ Makefile 15 Jan 2026 05:16:40 -0000
@@ -1,9 +1,8 @@
COMMENT= movie player supporting many formats
-V= 20240803
+V= 20251123
FFMPEG_V= 8.0.1
DISTNAME= mplayer-${V}
-REVISION= 6
CATEGORIES= x11 multimedia
SITES= https://comstyle.com/source/
EXTRACT_SUFX= .tar.xz
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.56
diff -u -p -u -p -r1.56 distinfo
--- distinfo 24 Nov 2024 08:50:45 -0000 1.56
+++ distinfo 15 Jan 2026 05:16:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20240803.tar.xz) = hiP7BVMGNwA8doA3pwBYUJOZGKeo292GRpW/VJy9DVQ=
-SIZE (mplayer-20240803.tar.xz) = 5235548
+SHA256 (mplayer-20251123.tar.xz) = hhr/D4gXx7jcCvr5vHaYTJy3Du0WcGq5ngxVUsfL4g4=
+SIZE (mplayer-20251123.tar.xz) = 5225544
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.98
diff -u -p -u -p -r1.98 patch-configure
--- patches/patch-configure 19 Feb 2025 05:43:13 -0000 1.98
+++ patches/patch-configure 15 Jan 2026 05:16:40 -0000
@@ -34,7 +34,7 @@ Index: configure
--enable-xv) _xv=yes ;;
--disable-xv) _xv=no ;;
--enable-vda) _vda=yes ;;
-@@ -1521,39 +1531,39 @@ echo configuration: $configuration > "$TMPLOG"
+@@ -1521,40 +1531,40 @@ echo configuration: $configuration > "$TMPLOG"
echo >> "$TMPLOG"
@@ -49,12 +49,13 @@ Index: configure
+# exit 1
+#fi
+#
-+#FFBRANCH=master
++#FFBRANCH="release/7.1"
+#test -e FFBRANCH && FFBRANCH=$(cat FFBRANCH)
+#
+#if test -e ffmpeg/mp_auto_pull ; then
++#
cfg_fetch="remote.origin.fetch=+refs/heads/$FFBRANCH:refs/remotes/origin/$FFBRANCH"
+# echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable"
-+# (cd ffmpeg && git checkout $FFBRANCH)
++# (cd ffmpeg && git -c "$cfg_fetch" fetch --depth 1 origin && git -c
"$cfg_fetch" checkout $FFBRANCH)
+# if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
+# echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable
pulling"
+# exit 1
@@ -76,12 +77,13 @@ Index: configure
+# touch ffmpeg/mp_auto_pull
+#fi
--FFBRANCH=master
+-FFBRANCH="release/7.1"
-test -e FFBRANCH && FFBRANCH=$(cat FFBRANCH)
-
-if test -e ffmpeg/mp_auto_pull ; then
+-
cfg_fetch="remote.origin.fetch=+refs/heads/$FFBRANCH:refs/remotes/origin/$FFBRANCH"
- echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable"
-- (cd ffmpeg && git checkout $FFBRANCH)
+- (cd ffmpeg && git -c "$cfg_fetch" fetch --depth 1 origin && git -c
"$cfg_fetch" checkout $FFBRANCH)
- if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
- echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable
pulling"
- exit 1
@@ -103,10 +105,10 @@ Index: configure
- touch ffmpeg/mp_auto_pull
-fi
-
- list_subparts() {
- test ! -e ffmpeg/libav${3} && return 1
- pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
-@@ -1990,7 +2000,10 @@ fi
+ ffmpeg_filter_struct_name=AVFilter
+ if grep -q FFFilter ffmpeg/configure; then
+ ffmpeg_filter_struct_name=FFFilter
+@@ -2009,7 +2019,10 @@ fi
if arm ; then
cc_check && host_arch=aarch64 || host_arch=arm
fi
@@ -117,7 +119,7 @@ Index: configure
echo "Detected operating system: $system_name"
echo "Detected host architecture: $host_arch"
-@@ -2544,7 +2557,7 @@ case "$host_arch" in
+@@ -2563,7 +2576,7 @@ case "$host_arch" in
arch='sparc'
iproc='sparc'
if test "$host_arch" = "sparc64" ; then
@@ -126,7 +128,7 @@ Index: configure
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
-@@ -2846,7 +2859,14 @@ EOF
+@@ -2864,7 +2877,14 @@ EOF
arch='arc'
iproc='arc'
;;
@@ -141,16 +143,16 @@ Index: configure
*)
echo "The architecture of your CPU ($host_arch) is not supported by this
configure script"
echo "It seems nobody has ported MPlayer to your OS or CPU type yet."
-@@ -2920,7 +2940,7 @@ cat > $TMPC << EOF
- int ff_extern;
- EOF
+@@ -2942,7 +2962,7 @@ os2 &&
+ { saved_filter_flags=$filter_flags; filter_flags=os2_aout_filter_flags; }
cc_check -c || die "Symbol mangling check failed."
+ os2 && filter_flags=$saved_filter_flags
-sym=$($_nm -P -g $TMPEXE | grep ff_extern)
+sym=$($_nm -g $TMPEXE | grep ff_extern | cut -d ' ' -f 3)
extern_prefix=${sym%%ff_extern*}
def_extern_asm="#define EXTERN_ASM $extern_prefix"
def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
-@@ -2985,7 +3005,7 @@ else
+@@ -3006,7 +3026,7 @@ else
fi
CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
@@ -159,7 +161,7 @@ Index: configure
# On glibc, add some more CPPFLAGS for enabling required functionality.
cpp_condition_check features.h "defined __GLIBC__" &&
-@@ -3066,7 +3086,7 @@ elif test $relocatable = "yes" ; then
+@@ -3087,7 +3107,7 @@ elif test $relocatable = "yes" ; then
fi
echores $relocatable
@@ -168,7 +170,7 @@ Index: configure
# Checking assembler (_as) compatibility...
# Added workaround for older as that reads from stdin by default - atmos
as_version=$(echo '' | $_as -version 2>&1 | sed -n 's/^.*assembler
\(version \)*\([0-9.]*\).*$/\2/p')
-@@ -4982,6 +5002,19 @@ else
+@@ -5003,6 +5023,19 @@ else
fi
echores "$_x11"
@@ -188,7 +190,7 @@ Index: configure
echocheck "Xss screensaver extensions"
if test "$_xss" = auto ; then
_xss=no
-@@ -6338,12 +6371,16 @@ fi #if irix
+@@ -6359,12 +6392,16 @@ fi #if irix
echocheck "sndio audio"
if test "$_sndio" = auto ; then
_sndio=no
@@ -207,7 +209,7 @@ Index: configure
else
def_sndio='#undef CONFIG_SNDIO_AUDIO'
noaomodules="sndio $noaomodules"
-@@ -6526,7 +6563,7 @@ echocheck "cdparanoia"
+@@ -6547,7 +6584,7 @@ echocheck "cdparanoia"
if test "$_cdparanoia" = auto ; then
_cdparanoia=no
for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
@@ -216,7 +218,7 @@ Index: configure
_cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
done
fi
-@@ -8417,6 +8454,7 @@ extra_ldflags="$extra_ldflags $libm"
+@@ -8438,6 +8475,7 @@ extra_ldflags="$extra_ldflags $libm"
# XML documentation tests
echocheck "XML catalogs"
for try_catalog in \
@@ -224,7 +226,7 @@ Index: configure
/etc/sgml/catalog \
/usr/share/xml/docbook/*/catalog.xml \
/opt/local/share/xml/docbook-xml/*/catalog.xml \
-@@ -8444,6 +8482,7 @@ fi
+@@ -8465,6 +8503,7 @@ fi
echocheck "XML chunked stylesheet"
for try_chunk_xsl in \
@@ -232,7 +234,7 @@ Index: configure
/usr/share/xml/docbook/*/html/chunk.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl \
-@@ -8469,6 +8508,7 @@ fi
+@@ -8490,6 +8529,7 @@ fi
echocheck "XML monolithic stylesheet"
for try_docbook_xsl in \
@@ -240,7 +242,7 @@ Index: configure
/usr/share/xml/docbook/*/html/docbook.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl \
-@@ -8522,6 +8562,7 @@ EOF
+@@ -8543,6 +8583,7 @@ EOF
echocheck "XML DTD"
#FIXME: This should prefer higher version numbers, not the other way around ..
for try_dtd in \
@@ -248,7 +250,7 @@ Index: configure
/usr/share/xml/docbook/*/dtd/4*/docbookx.dtd \
/usr/share/xml/docbook/*/docbookx.dtd \
/usr/share/sgml/docbook/*/docbookx.dtd \
-@@ -9433,6 +9474,7 @@ $def_xf86keysym
+@@ -9455,6 +9496,7 @@ $def_xf86keysym
$def_xinerama
$def_xmga
$def_xss
@@ -256,7 +258,7 @@ Index: configure
$def_xv
$def_xvr100
$def_yuv4mpeg
-@@ -9732,9 +9774,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h
+@@ -9754,9 +9796,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h
############################################################################
@@ -266,10 +268,10 @@ Index: configure
# Create avconfig.h for FFmpeg.
cat > "$TMPH" << EOF
/* Generated by mpconfigure */
-@@ -9827,8 +9866,6 @@ print_enabled_components libavformat/demuxer_list.c AV
- print_enabled_components libavformat/muxer_list.c AVOutputFormat muxer_list
$libavmuxers
+@@ -9849,8 +9888,6 @@ print_enabled_components libavformat/demuxer_list.c FF
+ print_enabled_components libavformat/muxer_list.c FFOutputFormat muxer_list
$libavmuxers
print_enabled_components libavformat/protocol_list.c URLProtocol
url_protocols $libavprotocols
- print_enabled_filters libavfilter/filter_list.c AVFilter filter_list
$libavfilters
+ print_enabled_filters libavfilter/filter_list.c "$ffmpeg_filter_struct_name"
filter_list $libavfilters
-
-fi
Index: patches/patch-libmpdemux_demux_lavf_c
===================================================================
RCS file: /cvs/ports/x11/mplayer/patches/patch-libmpdemux_demux_lavf_c,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-libmpdemux_demux_lavf_c
--- patches/patch-libmpdemux_demux_lavf_c 21 Oct 2025 13:07:21 -0000
1.6
+++ patches/patch-libmpdemux_demux_lavf_c 15 Jan 2026 05:16:40 -0000
@@ -20,10 +20,10 @@ Index: libmpdemux/demux_lavf.c
}
case AVMEDIA_TYPE_VIDEO:{
AVDictionaryEntry *rot = av_dict_get(st->metadata, "rotate",
NULL, 0);
-- const int32_t *disp_matrix = av_stream_get_side_data(st,
AV_PKT_DATA_DISPLAYMATRIX, NULL);
+- const int32_t *disp_matrix = (const int32_t
*)av_stream_get_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, NULL);
+ const AVPacketSideData *side_data =
av_packet_side_data_get(st->codecpar->coded_side_data,
+ st->codecpar->nb_coded_side_data, AV_PKT_DATA_DISPLAYMATRIX);
-+ const int32_t *disp_matrix = side_data ? (int32_t
*)side_data->data : NULL;
++ const int32_t *disp_matrix = side_data ? (const int32_t
*)side_data->data : NULL;
sh_video_t* sh_video;
BITMAPINFOHEADER *bih;
sh_video=new_sh_video_vid(demuxer, i, priv->video_streams);
