Here is an update to MPlayer 20221213.
It rolls in a few bug fixes.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.322
diff -u -p -u -p -r1.322 Makefile
--- Makefile 4 Dec 2022 20:12:36 -0000 1.322
+++ Makefile 14 Dec 2022 02:07:45 -0000
@@ -1,9 +1,8 @@
COMMENT= movie player supporting many formats
-V= 20211106
+V= 20221213
FFMPEG_V= 4.4.3
DISTNAME= mplayer-${V}
-REVISION= 3
CATEGORIES= x11 multimedia
MASTER_SITES= https://comstyle.com/source/
EXTRACT_SUFX= .tar.xz
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 14 Dec 2022 02:07:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20211106.tar.xz) =
abnH7MqAyIClXGKO+xmvhnOqYozshtmDz9teTWGWJjM=
-SIZE (mplayer-20211106.tar.xz) = 5178076
+SHA256 (mplayer-20221213.tar.xz) =
k32WJPsww3H0qD3ZWu7BYD+bztGnWdcjNLscTJCviPg=
+SIZE (mplayer-20221213.tar.xz) = 5173100
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-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>
#endif
-@@ -67,6 +68,9 @@
+@@ -67,11 +68,15 @@
#include IOCTL_BT848_H_NAME
#endif
@@ -23,15 +23,13 @@ Index: stream/tvi_bsdbt848.c
#ifdef HAVE_SYS_SOUNDCARD_H
#include <sys/soundcard.h>
#else
-@@ -76,6 +80,7 @@
#include <machine/soundcard.h>
#endif
- #endif
+#endif
#include "libaf/af_format.h"
#include "libmpcodecs/img_format.h"
-@@ -105,7 +110,13 @@ typedef struct priv {
+@@ -101,7 +106,13 @@ typedef struct priv {
/* Audio */
char *dspdev;
int dspready;
@@ -45,7 +43,7 @@ Index: stream/tvi_bsdbt848.c
int dspsamplesize;
int dspstereo;
int dspspeed;
-@@ -113,6 +124,9 @@ typedef struct priv {
+@@ -109,6 +120,9 @@ typedef struct priv {
int dspframesize;
int dsprate;
long long dspbytesread;
@@ -55,7 +53,7 @@ Index: stream/tvi_bsdbt848.c
/* Video */
char *btdev;
-@@ -162,6 +176,15 @@ static priv_t *G_private=NULL;
+@@ -158,6 +172,15 @@ static priv_t *G_private=NULL;
static int getinput(int innumber);
@@ -71,7 +69,7 @@ Index: stream/tvi_bsdbt848.c
static void processframe(int signal)
{
struct timeval curtime;
-@@ -222,7 +245,9 @@ static tvi_handle_t
*tvi_init_bsdbt848(tv_param_t* tv_
+@@ -218,7 +241,9 @@ static tvi_handle_t
*tvi_init_bsdbt848(tv_param_t* tv_
/* set audio device name */
if (!tv_param->adevice)
@@ -82,7 +80,7 @@ Index: stream/tvi_bsdbt848.c
priv->dspdev = strdup("/dev/sound");
#else
priv->dspdev = strdup("/dev/dsp");
-@@ -331,12 +356,39 @@ static int control(priv_t *priv, int cmd, void
*arg)
+@@ -327,12 +352,39 @@ static int control(priv_t *priv, int cmd, void
*arg)
{
int dspspeed = *(int *)arg;
@@ -123,7 +121,7 @@ Index: stream/tvi_bsdbt848.c
priv->dspspeed = dspspeed;
priv->dspframesize = priv->dspspeed*priv->dspsamplesize/8/
-@@ -645,12 +697,76 @@ priv->dspready = 1;
+@@ -641,12 +693,76 @@ priv->dspready = 1;
priv->dspsamplesize = 16;
priv->dspstereo = 1;
priv->dspspeed = 44100;
@@ -200,7 +198,7 @@ Index: stream/tvi_bsdbt848.c
if((priv->dspfd = open (priv->dspdev, O_RDONLY, 0)) < 0)
{
mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848ErrorOpeningDspDev,
strerror(errno));
-@@ -676,6 +792,8 @@ if(priv->dspready &&
+@@ -672,6 +788,8 @@ if(priv->dspready &&
priv->dspready = 0;
}
@@ -209,7 +207,7 @@ Index: stream/tvi_bsdbt848.c
return 1;
}
-@@ -699,7 +817,9 @@ if(ioctl(priv->btfd, METEORSSIGNAL, &marg) < 0)
+@@ -695,7 +813,9 @@ if(ioctl(priv->btfd, METEORSSIGNAL, &marg) < 0)
return 0;
}
@@ -219,7 +217,7 @@ Index: stream/tvi_bsdbt848.c
gettimeofday(&curtime, NULL);
-@@ -738,10 +858,15 @@ if(ioctl(priv->btfd, METEORCAPTUR, &marg) <
0 )
+@@ -734,10 +854,15 @@ if(ioctl(priv->btfd, METEORCAPTUR, &marg) < 0 )
return 0;
}
@@ -237,7 +235,7 @@ Index: stream/tvi_bsdbt848.c
priv->btfd = -1;
priv->dspready = priv->videoready = 0;
-@@ -821,13 +946,21 @@ gettimeofday(&curtime, NULL);
+@@ -817,13 +942,21 @@ gettimeofday(&curtime, NULL);
/* Get exactly one frame of audio, which forces video sync to
audio.. */
@@ -260,7 +258,7 @@ Index: stream/tvi_bsdbt848.c
{
mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848ErrorReadingAudio,
strerror(errno));
return 0;
-@@ -860,13 +993,19 @@ return priv->dspbytesread * 1.0 / priv->dsprate;
+@@ -856,13 +989,19 @@ return priv->dspbytesread * 1.0 / priv->dsprate;
static int get_audio_framesize(priv_t *priv)
{
int bytesavail;
