UPDATE: MPlayer 20230409

Here is an update to MPlayer 20230409 snapshot.


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.325
diff -u -p -u -p -r1.325 Makefile
--- Makefile 14 Mar 2023 10:08:13 -0000 1.325
+++ Makefile 9 Apr 2023 18:41:55 -0000
@@ -1,9 +1,8 @@
COMMENT= movie player supporting many formats

-V= 20211106
+V= 20230409
FFMPEG_V= 4.4.3
DISTNAME= mplayer-${V}
-REVISION= 6
CATEGORIES= x11 multimedia
MASTER_SITES= https://comstyle.com/source/
EXTRACT_SUFX= .tar.xz
@@ -19,8 +18,8 @@ WANTLIB= EGL GL SDL X11 Xext Xinerama Xs
avcodec avformat avutil bluray bs2b bz2 c cdda_interface \
cdda_paranoia crypto dv dvdnav dvdread enca fontconfig \
freetype fribidi gif iconv jpeg m mng mp3lame curses png \
- postproc pthread sndio ssl ${COMPILER_LIBCXX} swscale \
- swresample util x264 xvidcore z
+ postproc pthread sndio ssl swscale swresample util x264 \
+ xvidcore z

COMPILER= base-clang ports-gcc
COMPILER_LANGS= c
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 distinfo
--- distinfo 7 Dec 2021 20:03:57 -0000 1.54
+++ distinfo 9 Apr 2023 18:35:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20211106.tar.xz) = abnH7MqAyIClXGKO+xmvhnOqYozshtmDz9teTWGWJjM=
-SIZE (mplayer-20211106.tar.xz) = 5178076
+SHA256 (mplayer-20230409.tar.xz) = bwTz7Xl2T+HlT3FoBA5d1k6ZZiO5K9ITOBRiAPp6Fgo=
+SIZE (mplayer-20230409.tar.xz) = 5176244
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.95
diff -u -p -u -p -r1.95 patch-configure
--- patches/patch-configure 11 Mar 2022 20:16:48 -0000 1.95
+++ patches/patch-configure 14 Dec 2022 02:08:12 -0000
@@ -15,7 +15,7 @@ Index: configure
# Use this before starting a check
echocheck() {
echo "============ Checking for $@ ============" >> "$TMPLOG"
-@@ -1529,39 +1536,39 @@ echo configuration: $configuration > "$TMPLOG"
+@@ -1530,39 +1537,39 @@ echo configuration: $configuration > "$TMPLOG"
echo >> "$TMPLOG"


@@ -87,7 +87,7 @@ Index: configure
list_subparts() {
test ! -e ffmpeg/libav${3} && return 1
pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
-@@ -1991,7 +1998,10 @@ fi
+@@ -1995,7 +2002,10 @@ fi
if arm ; then
cc_check && host_arch=aarch64 || host_arch=arm
fi
@@ -98,7 +98,7 @@ Index: configure

echo "Detected operating system: $system_name"
echo "Detected host architecture: $host_arch"
-@@ -2534,7 +2544,7 @@ case "$host_arch" in
+@@ -2540,7 +2550,7 @@ case "$host_arch" in
arch='sparc'
iproc='sparc'
if test "$host_arch" = "sparc64" ; then
@@ -107,7 +107,7 @@ Index: configure
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
-@@ -2835,7 +2845,14 @@ EOF
+@@ -2841,7 +2851,14 @@ EOF
arch='arc'
iproc='arc'
;;
@@ -122,7 +122,7 @@ 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."
-@@ -2909,7 +2926,7 @@ cat > $TMPC << EOF
+@@ -2915,7 +2932,7 @@ cat > $TMPC << EOF
int ff_extern;
EOF
cc_check -c || die "Symbol mangling check failed."
@@ -131,7 +131,7 @@ Index: configure
extern_prefix=${sym%%ff_extern*}
def_extern_asm="#define EXTERN_ASM $extern_prefix"
def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
-@@ -2974,7 +2991,7 @@ else
+@@ -2980,7 +2997,7 @@ else
fi

CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
@@ -140,7 +140,7 @@ Index: configure

# On glibc, add some more CPPFLAGS for enabling required functionality.
cpp_condition_check features.h "defined __GLIBC__" &&
-@@ -3055,7 +3072,7 @@ elif test $relocatable = "yes" ; then
+@@ -3061,7 +3078,7 @@ elif test $relocatable = "yes" ; then
fi
echores $relocatable

@@ -177,7 +177,7 @@ Index: configure
_cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
done
fi
-@@ -8488,6 +8509,7 @@ extra_ldflags="$extra_ldflags $libm"
+@@ -8445,6 +8466,7 @@ extra_ldflags="$extra_ldflags $libm"
# XML documentation tests
echocheck "XML catalogs"
for try_catalog in \
@@ -185,7 +185,7 @@ Index: configure
/etc/sgml/catalog \
/usr/share/xml/docbook/*/catalog.xml \
/opt/local/share/xml/docbook-xml/*/catalog.xml \
-@@ -8515,6 +8537,7 @@ fi
+@@ -8472,6 +8494,7 @@ fi

echocheck "XML chunked stylesheet"
for try_chunk_xsl in \
@@ -193,7 +193,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 \
-@@ -8540,6 +8563,7 @@ fi
+@@ -8497,6 +8520,7 @@ fi

echocheck "XML monolithic stylesheet"
for try_docbook_xsl in \
@@ -201,7 +201,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 \
-@@ -8593,6 +8617,7 @@ EOF
+@@ -8550,6 +8574,7 @@ EOF
echocheck "XML DTD"
#FIXME: This should prefer higher version numbers, not the other way around ..
for try_dtd in \
@@ -209,7 +209,7 @@ Index: configure
/usr/share/xml/docbook/*/dtd/4*/docbookx.dtd \
/usr/share/xml/docbook/*/docbookx.dtd \
/usr/share/sgml/docbook/*/docbookx.dtd \
-@@ -9767,9 +9792,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h
+@@ -9753,9 +9778,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h

############################################################################

@@ -219,7 +219,7 @@ Index: configure
# Create avconfig.h for FFmpeg.
cat > "$TMPH" << EOF
/* Generated by mpconfigure */
-@@ -9861,8 +9883,6 @@ print_enabled_components libavformat/demuxer_list.c AV
+@@ -9848,8 +9870,6 @@ print_enabled_components libavformat/demuxer_list.c AV
print_enabled_components libavformat/muxer_list.c AVOutputFormat 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
Index: patches/patch-libao2_ao_sndio_c
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-libao2_ao_sndio_c,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-libao2_ao_sndio_c
--- patches/patch-libao2_ao_sndio_c 14 Mar 2023 10:08:13 -0000 1.6
+++ patches/patch-libao2_ao_sndio_c 9 Apr 2023 18:36:30 -0000
@@ -1,23 +1,7 @@
Index: libao2/ao_sndio.c
--- libao2/ao_sndio.c.orig
+++ libao2/ao_sndio.c
-@@ -159,6 +159,7 @@ err_out:
- pfds = NULL;
- sio_close(hdl);
- hdl = NULL;
-+ havevol = 0;
- return 0;
- }
-
-@@ -172,6 +173,7 @@ static void uninit(int immed)
- hdl = NULL;
- free(pfds);
- pfds = NULL;
-+ havevol = 0;
- }
-
- /*
-@@ -179,7 +181,7 @@ static void uninit(int immed)
+@@ -181,7 +181,7 @@ static void uninit(int immed)
*/
static void reset(void)
{
@@ -26,7 +10,7 @@ Index: libao2/ao_sndio.c
mp_msg(MSGT_AO, MSGL_ERR, "ao2: reset: couldn't stop\n");
delay = 0;
if (!sio_start(hdl))
-@@ -235,7 +237,7 @@ static void audio_pause(void)
+@@ -237,7 +237,7 @@ static void audio_pause(void)
* sndio can't pause, so just stop
*/
prepause_delay = delay;
Index: patches/patch-libmpcodecs_ve_lavc_c
===================================================================
RCS file: patches/patch-libmpcodecs_ve_lavc_c
diff -N patches/patch-libmpcodecs_ve_lavc_c
--- patches/patch-libmpcodecs_ve_lavc_c 6 Feb 2023 12:29:08 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-ve_lavc: Fix av_reallocp_array usage.
-
-Index: libmpcodecs/ve_lavc.c
---- libmpcodecs/ve_lavc.c.orig
-+++ libmpcodecs/ve_lavc.c
-@@ -441,8 +441,7 @@ static int config(struct vf_instance *vf,
- mp_msg(MSGT_MENCODER,MSGL_ERR,"error parsing vrc_q\n");
- return 0;
- }
-- lavc_venc_context->rc_override=
-- av_reallocp_array(lavc_venc_context->rc_override, i+1, sizeof(*lavc_venc_context->rc_override));
-+ av_reallocp_array(&lavc_venc_context->rc_override, i+1, sizeof(*lavc_venc_context->rc_override));
- lavc_venc_context->rc_override[i].start_frame= start;
- lavc_venc_context->rc_override[i].end_frame = end;
- if(q>0){
Index: patches/patch-stream_tvi_bsdbt848_c
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-stream_tvi_bsdbt848_c,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-stream_tvi_bsdbt848_c
--- patches/patch-stream_tvi_bsdbt848_c 11 Mar 2022 20:16:48 -0000 1.8
+++ patches/patch-stream_tvi_bsdbt848_c 14 Dec 2022 02:08:10 -0000
@@ -13,7 +13,7 @@ Index: stream/tvi_bsdbt848.c
#include <sys/audioio.h>