From subversion at mplayerhq.hu  Wed Jul  3 11:42:57 2024
From: subversion at mplayerhq.hu (reimar)
Date: Wed,  3 Jul 2024 11:42:57 +0300 (EEST)
Subject: [MPlayer-cvslog] r38636 - in trunk: libmpcodecs/ad_spdif.c
 libmpdemux/muxer_lavf.c libvo/osx_common.h libvo/osx_objc_common.m
Message-ID: <20240703084257.49B3D68D95C@ffbox0-bg.mplayerhq.hu>

Author: reimar
Date: Wed Jul  3 11:42:56 2024
New Revision: 38636

Log:
Some trivial compile fixes for newer compilers.

Modified:
   trunk/libmpcodecs/ad_spdif.c
   trunk/libmpdemux/muxer_lavf.c
   trunk/libvo/osx_common.h
   trunk/libvo/osx_objc_common.m

Modified: trunk/libmpcodecs/ad_spdif.c
==============================================================================
--- trunk/libmpcodecs/ad_spdif.c	Tue Jun 25 15:37:16 2024	(r38635)
+++ trunk/libmpcodecs/ad_spdif.c	Wed Jul  3 11:42:56 2024	(r38636)
@@ -54,7 +54,7 @@ static int read_packet(void *p, uint8_t
     return 0;
 }
 
-static int write_packet(void *p, uint8_t *buf, int buf_size)
+static int write_packet(void *p, const uint8_t *buf, int buf_size)
 {
     int len;
     struct spdifContext *ctx = p;

Modified: trunk/libmpdemux/muxer_lavf.c
==============================================================================
--- trunk/libmpdemux/muxer_lavf.c	Tue Jun 25 15:37:16 2024	(r38635)
+++ trunk/libmpdemux/muxer_lavf.c	Wed Jul  3 11:42:56 2024	(r38636)
@@ -77,7 +77,7 @@ const m_option_t lavfopts_conf[] = {
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
-static int mp_write(void *opaque, uint8_t *buf, int size)
+static int mp_write(void *opaque, const uint8_t *buf, int size)
 {
 	muxer_t *muxer = opaque;
 	return stream_write_buffer(muxer->stream, buf, size);

Modified: trunk/libvo/osx_common.h
==============================================================================
--- trunk/libvo/osx_common.h	Tue Jun 25 15:37:16 2024	(r38635)
+++ trunk/libvo/osx_common.h	Wed Jul  3 11:42:56 2024	(r38636)
@@ -19,6 +19,8 @@
 #ifndef MPLAYER_OSX_COMMON_H
 #define MPLAYER_OSX_COMMON_H
 
+struct MPGLContext;
+
 int convert_key(unsigned key, unsigned charcode);
 void change_movie_aspect(float new_aspect);
 void config_movie_aspect(float config_aspect);
@@ -32,6 +34,6 @@ void vo_osx_ontop(void);
 void vo_osx_fullscreen(void);
 int vo_osx_check_events(void);
 void vo_osx_update_xinerama_info(void);
-void vo_osx_swap_buffers(void);
+void vo_osx_swap_buffers(struct MPGLContext *);
 
 #endif /* MPLAYER_OSX_COMMON_H */

Modified: trunk/libvo/osx_objc_common.m
==============================================================================
--- trunk/libvo/osx_objc_common.m	Tue Jun 25 15:37:16 2024	(r38635)
+++ trunk/libvo/osx_objc_common.m	Wed Jul  3 11:42:56 2024	(r38636)
@@ -113,7 +113,7 @@ void vo_osx_update_xinerama_info(void)
     [oglv update_screen_info];
 }
 
-void vo_osx_swap_buffers(void)
+void vo_osx_swap_buffers(struct MPGLContext *)
 {
     [oglv->glContext flushBuffer];
 }

From subversion at mplayerhq.hu  Wed Jul  3 11:56:50 2024
From: subversion at mplayerhq.hu (reimar)
Date: Wed,  3 Jul 2024 11:56:50 +0300 (EEST)
Subject: [MPlayer-cvslog] r38637 - trunk/configure
Message-ID: <20240703085650.3F02B68D7F7@ffbox0-bg.mplayerhq.hu>

Author: reimar
Date: Wed Jul  3 11:56:50 2024
New Revision: 38637

Log:
configure: Fix compatibility with latest FFmpeg

Also add partial tcc support and update macOS support
to work better on modern systems.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Wed Jul  3 11:42:56 2024	(r38636)
+++ trunk/configure	Wed Jul  3 11:56:50 2024	(r38637)
@@ -1652,7 +1652,7 @@ libavprotocols=$(echo $libavprotocols_al
 libavfilters=$(echo $libavfilters_all)
 
 libavdecoders=$(filter_out_component decoder 'LIB[A-Z0-9_]* [A-Z0-9]*_QSV [A-Z0-9]*_MMAL [A-Z0-9]*_MEDIACODEC [A-Z0-9]*_CUVID [A-Z0-9_]*_AT [A-Z0-9]*_RKMPP [A-Z0-9]*_V4L2M2M')
-libavencoders=$(filter_out_component encoder 'LIB[A-Z0-9_]* [A-Z0-9]*_QSV [A-Z0-9]*_MMAL [A-Z0-9]*_MEDIACODEC NVENC[A-Z0-9_]* AV1_NVENC[A-Z0-9_]* H264_NVENC[A-Z0-9_]* HEVC_NVENC[A-Z0-9_]* HAP [A-Z0-9]*_VIDEOTOOLBOX [A-Z0-9]*_VAAPI [A-Z0-9]*_OMX [A-Z0-9_]*_AT [A-Z0-9]*_V4L2M2M [A-Z0-9]*_AMF [A-Z0-9]*_MF')
+libavencoders=$(filter_out_component encoder 'LIB[A-Z0-9_]* [A-Z0-9]*_QSV [A-Z0-9]*_MMAL [A-Z0-9]*_MEDIACODEC NVENC[A-Z0-9_]* AV1_NVENC[A-Z0-9_]* H264_NVENC[A-Z0-9_]* HEVC_NVENC[A-Z0-9_]* HAP [A-Z0-9]*_VIDEOTOOLBOX [A-Z0-9]*_VAAPI [A-Z0-9]*_OMX [A-Z0-9_]*_AT [A-Z0-9]*_V4L2M2M [A-Z0-9]*_AMF [A-Z0-9]*_MF' [A-Z0-9_]*D3D12VA[A-Z0-9_]*)
 libavbsfs=$(filter_out_component bsf 'TRACE_HEADERS [A-Z0-9_]*_METADATA H264_REDUNDANT_PPS FILTER_UNITS')
 libavdemuxers=$(filter_out_component demuxer 'AVISYNTH LIB[A-Z0-9_]* REDIR VAPOURSYNTH')
 libavmuxers=$(filter_out_component muxer 'CHROMAPRINT LIB[A-Z0-9_]* RTP RTSP SAP')
@@ -1777,6 +1777,14 @@ else
       echores "$cc_version"
       break
     fi
+    if test "$cc_name_tmp" = "tcc"; then
+      cc_name=$cc_name_tmp
+      echocheck "$_cc version"
+      cc_vendor=tcc
+      cc_version=$($_cc -dumpversion 2>&1)
+      echores "$cc_version"
+      break
+    fi
     if $_cc -v 2>&1 | grep -q "clang"; then
       echocheck "$_cc version"
       cc_vendor=clang
@@ -1951,10 +1959,6 @@ if wine ; then
   libs_mplayer="$libs_mplayer -lshell32"
 fi
 
-if darwin && test "$cc_vendor" != "clang" ; then
-  extra_cflags="-falign-loops=16 -shared-libgcc $extra_cflags"
-fi
-
 TMPEXE="$mplayer_tmpdir/tmp$_exesuf"
 
 echocheck "working compiler"
@@ -2567,7 +2571,8 @@ case "$host_arch" in
     arch='aarch64'
     iproc='aarch64'
     if test "$_runtime_cpudetection" = no ; then
-      cflag_check -march=native -mcpu=native -mfpu=auto && _march="-march=native -mcpu=native -mfpu=auto"
+      # some compilers now warn that mfpu=auto is unused
+      cflag_check -march=native -mcpu=native -mfpu=auto && _march="-march=native -mcpu=native -mfpu=auto" && cflag_check -Wno-unused-command-line-argument && _march="$_march -Wno-unused-command-line-argument"
     fi
     ;;
 
@@ -6412,7 +6417,7 @@ fi
 echocheck "VCD support"
 if test "$_vcd" = auto; then
   _vcd=no
-  if linux || freebsd || netbsd || openbsd || dragonfly || bsdos || darwin || sunos || os2; then
+  if linux || freebsd || netbsd || openbsd || dragonfly || bsdos || sunos || os2; then
     _vcd=yes
   elif mingw32; then
   header_check ddk/ntddcdrm.h && _vcd=yes
@@ -8954,6 +8959,7 @@ CONFIG_HUFFYUVENCDSP = yes
 CONFIG_IAMFDEC = yes
 CONFIG_IAMFENC = yes
 CONFIG_IDCTDSP = yes
+CONFIG_ISO_WRITER = yes
 CONFIG_TPELDSP = yes
 CONFIG_HUFFMAN = yes
 CONFIG_MDCT15  = yes