updates

5 files changed, 17 insertions, 170 deletions

diff --git a/repos/extra/ffmpeg/.files b/repos/extra/ffmpeg/.files
index 4c9ddda9..3f57519e 100644
--- a/repos/extra/ffmpeg/.files
+++ b/repos/extra/ffmpeg/.files
@@ -1,6 +1,7 @@
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/ffmpeg
+-rwxr-xr-x root/root    usr/bin/ffplay
 -rwxr-xr-x root/root    usr/bin/ffprobe
 drwxr-xr-x root/root    usr/include/
 drwxr-xr-x root/root    usr/include/libavcodec/
@@ -234,6 +235,8 @@ drwxr-xr-x root/root    usr/share/man/man1/
 -rw-r--r-- root/root    usr/share/man/man1/ffmpeg-scaler.1.gz
 -rw-r--r-- root/root    usr/share/man/man1/ffmpeg-utils.1.gz
 -rw-r--r-- root/root    usr/share/man/man1/ffmpeg.1.gz
+-rw-r--r-- root/root    usr/share/man/man1/ffplay-all.1.gz
+-rw-r--r-- root/root    usr/share/man/man1/ffplay.1.gz
 -rw-r--r-- root/root    usr/share/man/man1/ffprobe-all.1.gz
 -rw-r--r-- root/root    usr/share/man/man1/ffprobe.1.gz
 drwxr-xr-x root/root    usr/share/man/man3/
diff --git a/repos/extra/ffmpeg/abuild b/repos/extra/ffmpeg/abuild
index 0f281c73..e8dcf466 100644
--- a/repos/extra/ffmpeg/abuild
+++ b/repos/extra/ffmpeg/abuild
@@ -1,10 +1,8 @@
 name=ffmpeg
-version=6.1.1
+version=7.0.1
 release=1
 source="https://$name.org/releases/$name-$version.tar.xz
-	ffmpeg-6.0-chromium_method-1.patch
-	fef22c87ada4517441701e6e61e062c9f4399c8e.patch"
-#	ffmpeg-7.0-chromium_method-1.patch"
+	gcc-14.patch"
 
 build() {
 	./configure \
diff --git a/repos/extra/ffmpeg/fef22c87ada4517441701e6e61e062c9f4399c8e.patch b/repos/extra/ffmpeg/fef22c87ada4517441701e6e61e062c9f4399c8e.patch
deleted file mode 100644
index 93b8ac1b..00000000
--- a/repos/extra/ffmpeg/fef22c87ada4517441701e6e61e062c9f4399c8e.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From fef22c87ada4517441701e6e61e062c9f4399c8e Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Jan=20Ekstr=C3=B6m?= <jeebjp@gmail.com>
-Date: Wed, 14 Feb 2024 22:40:54 +0200
-Subject: [PATCH] {avcodec,tests}: rename the bundled Mesa AV1 vulkan video
- headers
-
-This together with adjusting the inclusion define allows for the
-build to not fail with latest Vulkan-Headers that contain the
-stabilized Vulkan AV1 decoding definitions.
-
-Compilation fails currently as the AV1 header is getting included
-via hwcontext_vulkan.h -> <vulkan/vulkan.h> -> vulkan_core.h, which
-finally includes vk_video/vulkan_video_codec_av1std.h and the decode
-header, leading to the bundled header to never defining anything
-due to the inclusion define being the same.
-
-This fix is imperfect, as it leads to additional re-definition
-warnings for things such as
-VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_SPEC_VERSION. , but it is
-not clear how to otherwise have the bundled version trump the
-actually standardized one for a short-term compilation fix.
-
-(cherry picked from commit e06ce6d2b45edac4a2df04f304e18d4727417d24)
----
- libavcodec/Makefile                                           | 4 ++--
- libavcodec/vulkan_video.h                                     | 4 ++--
- ...v1std_decode.h => vulkan_video_codec_av1std_decode_mesa.h} | 4 ++--
- ..._video_codec_av1std.h => vulkan_video_codec_av1std_mesa.h} | 4 ++--
- tests/ref/fate/source                                         | 4 ++--
- 5 files changed, 10 insertions(+), 10 deletions(-)
- rename libavcodec/{vulkan_video_codec_av1std_decode.h => vulkan_video_codec_av1std_decode_mesa.h} (89%)
- rename libavcodec/{vulkan_video_codec_av1std.h => vulkan_video_codec_av1std_mesa.h} (99%)
-
-diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index ec57e53e30..eb25707ef5 100644
---- a/libavcodec/Makefile
-+++ b/libavcodec/Makefile
-@@ -1284,7 +1284,7 @@ SKIPHEADERS                            += %_tablegen.h                  \
-                                           aacenc_quantization.h         \
-                                           aacenc_quantization_misc.h    \
-                                           bitstream_template.h          \
--                                          vulkan_video_codec_av1std.h   \
-+                                          vulkan_video_codec_av1std_mesa.h \
-                                           $(ARCH)/vpx_arith.h          \
- 
- SKIPHEADERS-$(CONFIG_AMF)              += amfenc.h
-@@ -1306,7 +1306,7 @@ SKIPHEADERS-$(CONFIG_XVMC)             += xvmc.h
- SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_decode.h vaapi_hevc.h vaapi_encode.h
- SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h
- SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX)     += videotoolbox.h vt_internal.h
--SKIPHEADERS-$(CONFIG_VULKAN)           += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode.h
-+SKIPHEADERS-$(CONFIG_VULKAN)           += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode_mesa.h
- SKIPHEADERS-$(CONFIG_V4L2_M2M)         += v4l2_buffers.h v4l2_context.h v4l2_m2m.h
- SKIPHEADERS-$(CONFIG_ZLIB)             += zlib_wrapper.h
- 
-diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h
-index b28e3fe0bd..51f44dd543 100644
---- a/libavcodec/vulkan_video.h
-+++ b/libavcodec/vulkan_video.h
-@@ -23,8 +23,8 @@
- #include "vulkan.h"
- 
- #include <vk_video/vulkan_video_codecs_common.h>
--#include "vulkan_video_codec_av1std.h"
--#include "vulkan_video_codec_av1std_decode.h"
-+#include "vulkan_video_codec_av1std_mesa.h"
-+#include "vulkan_video_codec_av1std_decode_mesa.h"
- 
- #define CODEC_VER_MAJ(ver) (ver >> 22)
- #define CODEC_VER_MIN(ver) ((ver >> 12) & ((1 << 10) - 1))
-diff --git a/libavcodec/vulkan_video_codec_av1std_decode.h b/libavcodec/vulkan_video_codec_av1std_decode_mesa.h
-similarity index 89%
-rename from libavcodec/vulkan_video_codec_av1std_decode.h
-rename to libavcodec/vulkan_video_codec_av1std_decode_mesa.h
-index a697c00593..e2f37b4e6e 100644
---- a/libavcodec/vulkan_video_codec_av1std_decode.h
-+++ b/libavcodec/vulkan_video_codec_av1std_decode_mesa.h
-@@ -14,8 +14,8 @@
-  * limitations under the License.
-  */
- 
--#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_
--#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1
-+#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_
-+#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_ 1
- 
- /*
- ** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
-diff --git a/libavcodec/vulkan_video_codec_av1std.h b/libavcodec/vulkan_video_codec_av1std_mesa.h
-similarity index 99%
-rename from libavcodec/vulkan_video_codec_av1std.h
-rename to libavcodec/vulkan_video_codec_av1std_mesa.h
-index c46236c457..c91589eee2 100644
---- a/libavcodec/vulkan_video_codec_av1std.h
-+++ b/libavcodec/vulkan_video_codec_av1std_mesa.h
-@@ -14,8 +14,8 @@
-  * limitations under the License.
-  */
- 
--#ifndef VULKAN_VIDEO_CODEC_AV1STD_H_
--#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1
-+#ifndef VULKAN_VIDEO_CODEC_AV1STD_MESA_H_
-+#define VULKAN_VIDEO_CODEC_AV1STD_MESA_H_ 1
- 
- /*
- ** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
-diff --git a/tests/ref/fate/source b/tests/ref/fate/source
-index c575789dd5..8bb58b61f1 100644
---- a/tests/ref/fate/source
-+++ b/tests/ref/fate/source
-@@ -23,8 +23,8 @@ compat/djgpp/math.h
- compat/float/float.h
- compat/float/limits.h
- libavcodec/bitstream_template.h
--libavcodec/vulkan_video_codec_av1std.h
--libavcodec/vulkan_video_codec_av1std_decode.h
-+libavcodec/vulkan_video_codec_av1std_decode_mesa.h
-+libavcodec/vulkan_video_codec_av1std_mesa.h
- tools/decode_simple.h
- Use of av_clip() where av_clip_uintp2() could be used:
- Use of av_clip() where av_clip_intp2() could be used:
--- 
-2.25.1
-
diff --git a/repos/extra/ffmpeg/ffmpeg-6.0-chromium_method-1.patch b/repos/extra/ffmpeg/ffmpeg-6.0-chromium_method-1.patch
deleted file mode 100644
index 9aee44a5..00000000
--- a/repos/extra/ffmpeg/ffmpeg-6.0-chromium_method-1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Submitted By: Marty Jack (martyj19 at comcast dot net)
-Date: 2022-07-23
-Initial Package Version: 5.1.0
-Origin: Rediffed from ffmpeg-5.0.1-api_addition-1.patch
-Upstream Status: Not accepted
-Description: The ffmpeg upstream is not willing to take this as a 
-permanent fix and suggests that Chromium should change to keep the 
-information locally to Chromium. Until that happens it appears 
-that many distros are carrying this patch as a temporary 
-expedient to allow building with system ffmpeg. 
-
-diff -Naur ffmpeg-5.1.orig/libavformat/avformat.h ffmpeg-5.1/libavformat/avformat.h
---- ffmpeg-5.1.orig/libavformat/avformat.h	2022-07-22 13:58:39.000000000 -0400
-+++ ffmpeg-5.1/libavformat/avformat.h	2022-07-22 19:34:07.490051886 -0400
-@@ -1128,6 +1128,10 @@
-  */
- int64_t    av_stream_get_end_pts(const AVStream *st);
- 
-+// Chromium: We use the internal field first_dts vvv
-+int64_t    av_stream_get_first_dts(const AVStream *st);
-+// Chromium: We use the internal field first_dts ^^^
-+
- #define AV_PROGRAM_RUNNING 1
- 
- /**
-diff -Naur ffmpeg-5.1.orig/libavformat/demux_utils.c ffmpeg-5.1/libavformat/demux_utils.c
---- ffmpeg-5.1.orig/libavformat/demux_utils.c	2022-07-22 13:58:39.000000000 -0400
-+++ ffmpeg-5.1/libavformat/demux_utils.c	2022-07-22 19:36:39.646735587 -0400
-@@ -29,6 +29,13 @@
- #include "demux.h"
- #include "internal.h"
- 
-+// Chromium: We use the internal field first_dts vvv
-+int64_t av_stream_get_first_dts(const AVStream *st)
-+{
-+  return cffstream(st)->first_dts;
-+}
-+// Chromium: We use the internal field first_dts ^^^
-+
- struct AVCodecParserContext *av_stream_get_parser(const AVStream *st)
- {
-     return cffstream(st)->parser;
diff --git a/repos/extra/ffmpeg/gcc-14.patch b/repos/extra/ffmpeg/gcc-14.patch
new file mode 100644
index 00000000..c9ab18c7
--- /dev/null
+++ b/repos/extra/ffmpeg/gcc-14.patch
@@ -0,0 +1,12 @@
+diff --git a/configure b/configure
+index 4f5353f..88c66f3 100755
+--- a/configure
++++ b/configure
+@@ -7540,6 +7540,7 @@ elif enabled gcc; then
+     check_cflags -Werror=return-type
+     check_cflags -Werror=vla
+     check_cflags -Wformat
++    check_cflags -Wno-error=incompatible-pointer-types
+     check_cflags -fdiagnostics-color=auto
+     enabled extra_warnings || check_disable_warning -Wno-maybe-uninitialized
+     if enabled x86_32; then