Here is an update to MPlayer 20241129. To roll up to the latest. I was mainly interested in r38638 and r38664.
------------------------------------------------------------------------ r38666 | komh | 2024-10-07 08:24:56 -0400 (Mon, 07 Oct 2024) | 10 lines configure: remove -Zomf from flags when checking extern symbol prefix on OS/2 OS/2 nm does work only with aout format. If -Zomf is given, gcc generates OMF object file not aout object file. As a result, nm fails to detect extern symbol prefix. This allows users to pass -Zomf to configure via --extra-cflags and/or --extra-ldfalgs. ------------------------------------------------------------------------ r38665 | ib | 2024-10-05 15:07:25 -0400 (Sat, 05 Oct 2024) | 4 lines Use correct type to define the variable passed to lzo1x_1_compress(). Recent compilers consider an implicit cast to be an error. ------------------------------------------------------------------------ r38664 | ib | 2024-10-01 08:43:31 -0400 (Tue, 01 Oct 2024) | 4 lines Check the return value of malloc() to avoid a NULL pointer dereference. This fixes https://bugs.debian.org/1083029 and closes Trac #2426. ------------------------------------------------------------------------ r38663 | komh | 2024-10-01 04:42:31 -0400 (Tue, 01 Oct 2024) | 8 lines configure: define _EMX_SOURCE on OS/2 -std=c11 disables many extensions of OS/2 kLIBC. And this causes many compilation errors such as implicit functions. To enable extensions of OS/2 kLIBC, define _EMX_SOURCE. ------------------------------------------------------------------------ r38662 | komh | 2024-10-01 04:05:38 -0400 (Tue, 01 Oct 2024) | 7 lines osdep/mmap.h: define MAP_FAILED if necessary If sys/mman.h defines MAP_FAILED, config.h will not define MAP_FAILED. In this case, MAP_FAILED is not defined at all and compilation errors occur. ------------------------------------------------------------------------ r38661 | komh | 2024-10-01 03:59:39 -0400 (Tue, 01 Oct 2024) | 8 lines ao_dart, ao_kai: fix compilation due to switch from AVFifoBuffer to AVFifo Based on the changes to ao_sdl, http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2024-April/047665.html Patch by Dave Yeo, dave.r.yeo gmail com ------------------------------------------------------------------------ r38660 | cigaes | 2024-09-21 05:30:18 -0400 (Sat, 21 Sep 2024) | 1 line libvo/gl_common: fix incompatible pointer types ------------------------------------------------------------------------ r38659 | cigaes | 2024-09-21 05:30:17 -0400 (Sat, 21 Sep 2024) | 3 lines sub/spudec: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38658 | cigaes | 2024-09-21 05:30:16 -0400 (Sat, 21 Sep 2024) | 3 lines sub/sub: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38657 | cigaes | 2024-09-21 05:30:15 -0400 (Sat, 21 Sep 2024) | 3 lines mplayer: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38656 | cigaes | 2024-09-21 05:30:14 -0400 (Sat, 21 Sep 2024) | 3 lines mp_msg: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38655 | cigaes | 2024-09-21 05:30:13 -0400 (Sat, 21 Sep 2024) | 3 lines loader/qtx/qtxsdk/components: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38654 | cigaes | 2024-09-21 05:30:12 -0400 (Sat, 21 Sep 2024) | 3 lines libvo/vo_x11: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38653 | cigaes | 2024-09-21 05:30:11 -0400 (Sat, 21 Sep 2024) | 3 lines libvo/vo_matrixview: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38652 | cigaes | 2024-09-21 05:30:10 -0400 (Sat, 21 Sep 2024) | 3 lines libvo/vo_aa: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38651 | cigaes | 2024-09-21 05:30:09 -0400 (Sat, 21 Sep 2024) | 3 lines libmpdemux/muxer_avi: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38650 | cigaes | 2024-09-21 05:30:09 -0400 (Sat, 21 Sep 2024) | 3 lines libmpdemux/demux_lavf: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38649 | cigaes | 2024-09-21 05:30:08 -0400 (Sat, 21 Sep 2024) | 3 lines libmpdemux/demux_film: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38648 | cigaes | 2024-09-21 05:30:07 -0400 (Sat, 21 Sep 2024) | 3 lines libmpcodecs/vf_screenshot: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38647 | cigaes | 2024-09-21 05:30:06 -0400 (Sat, 21 Sep 2024) | 3 lines libmpcodecs/vf_scale: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38646 | cigaes | 2024-09-21 05:30:05 -0400 (Sat, 21 Sep 2024) | 3 lines libmpcodecs/vf_pp: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38645 | cigaes | 2024-09-21 05:30:04 -0400 (Sat, 21 Sep 2024) | 3 lines libmpcodecs/vd_ffmpeg: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38644 | cigaes | 2024-09-21 05:30:04 -0400 (Sat, 21 Sep 2024) | 1 line libmpcodecs/ad_spdif: fix type of argument ------------------------------------------------------------------------ r38643 | cigaes | 2024-09-21 05:30:03 -0400 (Sat, 21 Sep 2024) | 3 lines libaf/af_lavcresample: explicit pointer casts Recent compilers consider implicit casts an error. ------------------------------------------------------------------------ r38642 | cigaes | 2024-09-21 05:30:02 -0400 (Sat, 21 Sep 2024) | 3 lines configure: replace AV*putFormat with FF* Like ffmpeg. ------------------------------------------------------------------------ r38641 | cigaes | 2024-09-21 05:30:01 -0400 (Sat, 21 Sep 2024) | 3 lines configure: enable DOVI encoder Fix build. ------------------------------------------------------------------------ r38640 | cigaes | 2024-09-21 05:30:00 -0400 (Sat, 21 Sep 2024) | 5 lines configure: remove -ffast-math Nowadays most speed-critical code has asm optimizations. Fix a strange delay with lavf files. ------------------------------------------------------------------------ r38639 | cigaes | 2024-09-21 05:29:59 -0400 (Sat, 21 Sep 2024) | 3 lines configure: disable Vulkan encoders They require headers, build fails without. ------------------------------------------------------------------------ r38638 | ib | 2024-08-24 13:33:09 -0400 (Sat, 24 Aug 2024) | 9 lines Fix lost full screen mode and lost video menu items. This all disappeared in svn r38514, where the video driver for the GUI was no longer implicitly set, and without a specified video driver, GUI_PREPARE could not decide if there would be a video window. This is now determined later at GUI_SET_VIDEO when a video output driver is finally set. Index: Makefile =================================================================== RCS file: /cvs/ports/x11/mplayer/Makefile,v retrieving revision 1.333 diff -u -p -u -p -r1.333 Makefile --- Makefile 2 Dec 2024 06:14:53 -0000 1.333 +++ Makefile 3 Dec 2024 06:45:46 -0000 @@ -1,9 +1,8 @@ COMMENT= movie player supporting many formats -V= 20240803 +V= 20241129 FFMPEG_V= 6.1.2 DISTNAME= mplayer-${V} -REVISION= 1 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 3 Dec 2024 06:45:46 -0000 @@ -1,2 +1,2 @@ -SHA256 (mplayer-20240803.tar.xz) = hiP7BVMGNwA8doA3pwBYUJOZGKeo292GRpW/VJy9DVQ= -SIZE (mplayer-20240803.tar.xz) = 5235548 +SHA256 (mplayer-20241129.tar.xz) = hLAbv5KcjsK5dfZayrqDxigTqq6juQ+YTrd9DO9qdEg= +SIZE (mplayer-20241129.tar.xz) = 5229444 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/x11/mplayer/patches/patch-configure,v retrieving revision 1.97 diff -u -p -u -p -r1.97 patch-configure --- patches/patch-configure 24 Nov 2024 08:50:45 -0000 1.97 +++ patches/patch-configure 3 Dec 2024 06:45:46 -0000 @@ -87,7 +87,7 @@ Index: configure list_subparts() { test ! -e ffmpeg/libav${3} && return 1 pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p" -@@ -1990,7 +1997,10 @@ fi +@@ -2000,7 +2007,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" -@@ -2544,7 +2554,7 @@ case "$host_arch" in +@@ -2554,7 +2564,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 -@@ -2846,7 +2856,14 @@ EOF +@@ -2856,7 +2866,14 @@ EOF arch='arc' iproc='arc' ;; @@ -122,16 +122,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 +2937,7 @@ cat > $TMPC << EOF - int ff_extern; - EOF +@@ -2934,7 +2951,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 +3002,7 @@ else +@@ -2998,7 +3015,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__" && -@@ -3066,7 +3083,7 @@ elif test $relocatable = "yes" ; then +@@ -3079,7 +3096,7 @@ elif test $relocatable = "yes" ; then fi echores $relocatable @@ -149,7 +149,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') -@@ -6338,12 +6355,16 @@ fi #if irix +@@ -6351,12 +6368,16 @@ fi #if irix echocheck "sndio audio" if test "$_sndio" = auto ; then _sndio=no @@ -168,7 +168,7 @@ Index: configure else def_sndio='#undef CONFIG_SNDIO_AUDIO' noaomodules="sndio $noaomodules" -@@ -6526,7 +6547,7 @@ echocheck "cdparanoia" +@@ -6539,7 +6560,7 @@ echocheck "cdparanoia" if test "$_cdparanoia" = auto ; then _cdparanoia=no for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do @@ -177,7 +177,7 @@ Index: configure _cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break done fi -@@ -8417,6 +8438,7 @@ extra_ldflags="$extra_ldflags $libm" +@@ -8430,6 +8451,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 \ -@@ -8444,6 +8466,7 @@ fi +@@ -8457,6 +8479,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 \ -@@ -8469,6 +8492,7 @@ fi +@@ -8482,6 +8505,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 \ -@@ -8522,6 +8546,7 @@ EOF +@@ -8535,6 +8559,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 \ -@@ -9732,9 +9757,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h +@@ -9746,9 +9771,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h ############################################################################ @@ -219,8 +219,8 @@ Index: configure # Create avconfig.h for FFmpeg. cat > "$TMPH" << EOF /* Generated by mpconfigure */ -@@ -9827,8 +9849,6 @@ print_enabled_components libavformat/demuxer_list.c AV - print_enabled_components libavformat/muxer_list.c AVOutputFormat muxer_list $libavmuxers +@@ -9841,8 +9863,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 -
