Brad Smith wrote:
> Here is an update to MPlayer snapshot from 20211106.
>
> [ big list of changes ]
Looks good. I lightly tested mplayer video playback on various formats.
Still works. I did not test anything that depends on mplayer or mencoder.
The two dropped patches have been upstreamed.
portcheck, lib-depends-check are happy.
ok sdk@
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
> retrieving revision 1.316
> diff -u -p -u -p -r1.316 Makefile
> --- Makefile 8 Nov 2021 12:42:11 -0000 1.316
> +++ Makefile 7 Nov 2021 03:08:48 -0000
> @@ -1,11 +1,10 @@
> -# $OpenBSD: Makefile,v 1.316 2021/11/08 12:42:11 sthen Exp $
> +# $OpenBSD: Makefile,v 1.315 2021/07/25 15:13:21 matthieu Exp $
>
> COMMENT= movie player supporting many formats
>
> -V= 20210124
> +V= 20211106
> FFMPEG_V= 4.4.1
> DISTNAME= mplayer-${V}
> -REVISION= 4
> 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.53
> diff -u -p -u -p -r1.53 distinfo
> --- distinfo 6 Feb 2021 21:46:32 -0000 1.53
> +++ distinfo 7 Nov 2021 03:08:09 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (mplayer-20210124.tar.xz) =
> lFK2anWHpV8JKwI29rkQdCpopUJgKygmFcfIn+SWcFI=
> -SIZE (mplayer-20210124.tar.xz) = 5169156
> +SHA256 (mplayer-20211106.tar.xz) =
> abnH7MqAyIClXGKO+xmvhnOqYozshtmDz9teTWGWJjM=
> +SIZE (mplayer-20211106.tar.xz) = 5178076
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /home/cvs/ports/x11/mplayer/patches/patch-Makefile,v
> retrieving revision 1.33
> diff -u -p -u -p -r1.33 patch-Makefile
> --- patches/patch-Makefile 25 Dec 2019 15:52:25 -0000 1.33
> +++ patches/patch-Makefile 7 Nov 2021 03:11:40 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.33 2019/12/
> Index: Makefile
> --- Makefile.orig
> +++ Makefile
> -@@ -35,6 +35,7 @@ OS_FEATURE-$(VSSCANF) += osdep/vsscanf.
> +@@ -36,6 +36,7 @@ OS_FEATURE-$(VSSCANF) += osdep/vsscanf.
> # conditional source declarations
> SRCS_AUDIO_INPUT-$(ALSA) += stream/ai_alsa.c
> SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c
> @@ -11,7 +11,7 @@ Index: Makefile
> SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes)
> SRCS_COMMON-$(BITMAP_FONT) += sub/font_load.c
> SRCS_COMMON-$(CDDA) += stream/stream_cdda.c \
> -@@ -611,7 +612,8 @@ SRCS_MPLAYER = command.c \
> +@@ -614,7 +615,8 @@ SRCS_MPLAYER = command.c \
> libvo/vo_mpegpes.c \
> libvo/vo_null.c \
> sub/spuenc.c \
> Index: patches/patch-configure
> ===================================================================
> RCS file: /home/cvs/ports/x11/mplayer/patches/patch-configure,v
> retrieving revision 1.91
> diff -u -p -u -p -r1.91 patch-configure
> --- patches/patch-configure 25 Jul 2021 15:13:21 -0000 1.91
> +++ patches/patch-configure 7 Nov 2021 03:11:38 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.91 2021/07
> Index: configure
> --- configure.orig
> +++ configure
> -@@ -284,6 +284,13 @@ arm() {
> +@@ -289,6 +289,13 @@ arm() {
> esac
> }
>
> @@ -17,7 +17,7 @@ Index: configure
> # Use this before starting a check
> echocheck() {
> echo "============ Checking for $@ ============" >> "$TMPLOG"
> -@@ -1514,39 +1521,39 @@ echo configuration: $configuration > "$TMPLOG"
> +@@ -1529,39 +1536,39 @@ echo configuration: $configuration > "$TMPLOG"
> echo >> "$TMPLOG"
>
>
> @@ -89,7 +89,7 @@ Index: configure
> list_subparts() {
> test ! -e ffmpeg/libav${3} && return 1
> pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
> -@@ -1928,7 +1935,10 @@ fi
> +@@ -1991,7 +1998,10 @@ fi
> if arm ; then
> cc_check && host_arch=aarch64 || host_arch=arm
> fi
> @@ -100,7 +100,7 @@ Index: configure
>
> echo "Detected operating system: $system_name"
> echo "Detected host architecture: $host_arch"
> -@@ -2465,7 +2475,7 @@ case "$host_arch" in
> +@@ -2534,7 +2544,7 @@ case "$host_arch" in
> arch='sparc'
> iproc='sparc'
> if test "$host_arch" = "sparc64" ; then
> @@ -109,7 +109,7 @@ Index: configure
> proc='ultrasparc'
> def_fast_64bit='#define HAVE_FAST_64BIT 1'
> elif sunos ; then
> -@@ -2766,7 +2776,14 @@ EOF
> +@@ -2835,7 +2845,14 @@ EOF
> arch='arc'
> iproc='arc'
> ;;
> @@ -124,7 +124,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."
> -@@ -2840,7 +2857,7 @@ cat > $TMPC << EOF
> +@@ -2909,7 +2926,7 @@ cat > $TMPC << EOF
> int ff_extern;
> EOF
> cc_check -c || die "Symbol mangling check failed."
> @@ -133,7 +133,7 @@ Index: configure
> extern_prefix=${sym%%ff_extern*}
> def_extern_asm="#define EXTERN_ASM $extern_prefix"
> def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
> -@@ -2905,7 +2922,7 @@ else
> +@@ -2974,7 +2991,7 @@ else
> fi
>
> CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
> @@ -142,7 +142,7 @@ Index: configure
>
> # On glibc, add some more CPPFLAGS for enabling required functionality.
> cpp_condition_check features.h "defined __GLIBC__" &&
> -@@ -2986,7 +3003,7 @@ elif test $relocatable = "yes" ; then
> +@@ -3055,7 +3072,7 @@ elif test $relocatable = "yes" ; then
> fi
> echores $relocatable
>
> @@ -151,18 +151,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')
> -@@ -4420,8 +4437,8 @@ echores "$gettimeofday"
> - echocheck "clock_gettime()"
> - clock_gettime=no
> - def_clock_gettime='#undef HAVE_CLOCK_GETTIME'
> --statement_check_broken stddef.h time.h 'struct timespec tp;
> clock_gettime(CLOCK_MONOTONIC, &tp)' -lrt &&
> -- { clock_gettime=yes ; def_clock_gettime='#define HAVE_CLOCK_GETTIME 1'
> ; extra_ldflags="$extra_ldflags -lrt" ; }
> -+statement_check_broken stddef.h time.h 'struct timespec tp;
> clock_gettime(CLOCK_MONOTONIC, &tp)' &&
> -+ { clock_gettime=yes ; def_clock_gettime='#define HAVE_CLOCK_GETTIME 1'
> ; }
> - echores "$clock_gettime"
> -
> -
> -@@ -6403,7 +6420,7 @@ echocheck "cdparanoia"
> +@@ -6553,7 +6570,7 @@ echocheck "cdparanoia"
> if test "$_cdparanoia" = auto ; then
> _cdparanoia=no
> for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
> @@ -171,7 +160,7 @@ Index: configure
> _cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
> done
> fi
> -@@ -8302,6 +8319,7 @@ extra_ldflags="$extra_ldflags $libm"
> +@@ -8488,6 +8505,7 @@ extra_ldflags="$extra_ldflags $libm"
> # XML documentation tests
> echocheck "XML catalogs"
> for try_catalog in \
> @@ -179,7 +168,7 @@ Index: configure
> /etc/sgml/catalog \
> /usr/share/xml/docbook/*/catalog.xml \
> /opt/local/share/xml/docbook-xml/*/catalog.xml \
> -@@ -8329,6 +8347,7 @@ fi
> +@@ -8515,6 +8533,7 @@ fi
>
> echocheck "XML chunked stylesheet"
> for try_chunk_xsl in \
> @@ -187,7 +176,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 \
> -@@ -8354,6 +8373,7 @@ fi
> +@@ -8540,6 +8559,7 @@ fi
>
> echocheck "XML monolithic stylesheet"
> for try_docbook_xsl in \
> @@ -195,7 +184,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 \
> -@@ -8407,6 +8427,7 @@ EOF
> +@@ -8593,6 +8613,7 @@ EOF
> echocheck "XML DTD"
> #FIXME: This should prefer higher version numbers, not the other way around
> ..
> for try_dtd in \
> @@ -203,7 +192,7 @@ Index: configure
> /usr/share/xml/docbook/*/dtd/4*/docbookx.dtd \
> /usr/share/xml/docbook/*/docbookx.dtd \
> /usr/share/sgml/docbook/*/docbookx.dtd \
> -@@ -9565,9 +9586,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h
> +@@ -9767,9 +9788,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h
>
> ############################################################################
>
> @@ -213,7 +202,7 @@ Index: configure
> # Create avconfig.h for FFmpeg.
> cat > "$TMPH" << EOF
> /* Generated by mpconfigure */
> -@@ -9659,8 +9677,6 @@ print_enabled_components libavformat/demuxer_list.c AV
> +@@ -9861,8 +9879,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_stream_cddb_c
> ===================================================================
> RCS file: patches/patch-stream_stream_cddb_c
> diff -N patches/patch-stream_stream_cddb_c
> --- patches/patch-stream_stream_cddb_c 9 Jul 2020 16:14:07 -0000
> 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-stream_stream_cddb_c,v 1.3 2020/07/09 16:14:07 naddy Exp $
> -
> -Index: stream/stream_cddb.c
> ---- stream/stream_cddb.c.orig
> -+++ stream/stream_cddb.c
> -@@ -77,7 +77,7 @@
> - #include "network.h"
> - #include "libavutil/common.h"
> -
> --#define DEFAULT_FREEDB_SERVER "freedb.freedb.org"
> -+#define DEFAULT_FREEDB_SERVER "gnudb.gnudb.org"
> - #define DEFAULT_CACHE_DIR "/.cddb/"
> -
> - typedef struct {
> Index: patches/patch-stream_stream_h
> ===================================================================
> RCS file: /home/cvs/ports/x11/mplayer/patches/patch-stream_stream_h,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-stream_stream_h
> --- patches/patch-stream_stream_h 11 Apr 2018 12:01:23 -0000 1.1
> +++ patches/patch-stream_stream_h 7 Nov 2021 03:11:38 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-stream_stream_h,v 1.1 20
> Index: stream/stream.h
> --- stream/stream.h.orig
> +++ stream/stream.h
> -@@ -318,11 +318,11 @@ static inline int64_t stream_tell(stream_t *s)
> +@@ -319,11 +319,11 @@ static inline int64_t stream_tell(stream_t *s)
> static inline int stream_seek(stream_t *s, int64_t pos)
> {
>
>
