Woodpecker CI ccf1976e5a4ced44372d2d60ee8b73f784c8e7dd [SKIP CI]

5 files changed, 64 insertions, 49 deletions

diff --git a/ffmpeg/.checksum b/ffmpeg/.checksum
index 46314e65..dc019715 100644
--- a/ffmpeg/.checksum
+++ b/ffmpeg/.checksum
@@ -1,2 +1,2 @@
-14a777a99c81f8e5fa93b9bd4abc04e6c4ec0aaf6bb5d9455cad0481870a4e33  ffmpeg-7.1.1.tar.xz
-65b5a3a417d2d8d87cd11fa14d40ada9cbe4521edf3db7dfd8e7510b2b416a2a  gcc-14.patch
+1cdbcddbf977dc62ee2cd8ffa61631eabdab717268b94f5f2eb2617040239be2  ffmpeg-8.0.tar.xz
+c9e63a5b7cebaa80cdb3cad774261fb2a5acfee9e91e5943cfbb50cfbdb4bc61  libressl.patch
diff --git a/ffmpeg/.files b/ffmpeg/.files
index 199a8cfc..24ffee02 100644
--- a/ffmpeg/.files
+++ b/ffmpeg/.files
@@ -1,7 +1,6 @@
 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/
@@ -9,7 +8,6 @@ drwxr-xr-x root/root    usr/include/libavcodec/
 -rw-r--r-- root/root    usr/include/libavcodec/adts_parser.h
 -rw-r--r-- root/root    usr/include/libavcodec/avcodec.h
 -rw-r--r-- root/root    usr/include/libavcodec/avdct.h
--rw-r--r-- root/root    usr/include/libavcodec/avfft.h
 -rw-r--r-- root/root    usr/include/libavcodec/bsf.h
 -rw-r--r-- root/root    usr/include/libavcodec/codec.h
 -rw-r--r-- root/root    usr/include/libavcodec/codec_desc.h
@@ -24,6 +22,7 @@ drwxr-xr-x root/root    usr/include/libavcodec/
 -rw-r--r-- root/root    usr/include/libavcodec/mediacodec.h
 -rw-r--r-- root/root    usr/include/libavcodec/packet.h
 -rw-r--r-- root/root    usr/include/libavcodec/qsv.h
+-rw-r--r-- root/root    usr/include/libavcodec/smpte_436m.h
 -rw-r--r-- root/root    usr/include/libavcodec/vdpau.h
 -rw-r--r-- root/root    usr/include/libavcodec/version.h
 -rw-r--r-- root/root    usr/include/libavcodec/version_major.h
@@ -64,6 +63,7 @@ drwxr-xr-x root/root    usr/include/libavutil/
 -rw-r--r-- root/root    usr/include/libavutil/cast5.h
 -rw-r--r-- root/root    usr/include/libavutil/channel_layout.h
 -rw-r--r-- root/root    usr/include/libavutil/common.h
+-rw-r--r-- root/root    usr/include/libavutil/container_fifo.h
 -rw-r--r-- root/root    usr/include/libavutil/cpu.h
 -rw-r--r-- root/root    usr/include/libavutil/crc.h
 -rw-r--r-- root/root    usr/include/libavutil/csp.h
@@ -87,12 +87,14 @@ drwxr-xr-x root/root    usr/include/libavutil/
 -rw-r--r-- root/root    usr/include/libavutil/hdr_dynamic_vivid_metadata.h
 -rw-r--r-- root/root    usr/include/libavutil/hmac.h
 -rw-r--r-- root/root    usr/include/libavutil/hwcontext.h
+-rw-r--r-- root/root    usr/include/libavutil/hwcontext_amf.h
 -rw-r--r-- root/root    usr/include/libavutil/hwcontext_cuda.h
 -rw-r--r-- root/root    usr/include/libavutil/hwcontext_d3d11va.h
 -rw-r--r-- root/root    usr/include/libavutil/hwcontext_d3d12va.h
 -rw-r--r-- root/root    usr/include/libavutil/hwcontext_drm.h
 -rw-r--r-- root/root    usr/include/libavutil/hwcontext_dxva2.h
 -rw-r--r-- root/root    usr/include/libavutil/hwcontext_mediacodec.h
+-rw-r--r-- root/root    usr/include/libavutil/hwcontext_oh.h
 -rw-r--r-- root/root    usr/include/libavutil/hwcontext_opencl.h
 -rw-r--r-- root/root    usr/include/libavutil/hwcontext_qsv.h
 -rw-r--r-- root/root    usr/include/libavutil/hwcontext_vaapi.h
@@ -121,6 +123,7 @@ drwxr-xr-x root/root    usr/include/libavutil/
 -rw-r--r-- root/root    usr/include/libavutil/random_seed.h
 -rw-r--r-- root/root    usr/include/libavutil/rational.h
 -rw-r--r-- root/root    usr/include/libavutil/rc4.h
+-rw-r--r-- root/root    usr/include/libavutil/refstruct.h
 -rw-r--r-- root/root    usr/include/libavutil/replaygain.h
 -rw-r--r-- root/root    usr/include/libavutil/ripemd.h
 -rw-r--r-- root/root    usr/include/libavutil/samplefmt.h
@@ -128,6 +131,7 @@ drwxr-xr-x root/root    usr/include/libavutil/
 -rw-r--r-- root/root    usr/include/libavutil/sha512.h
 -rw-r--r-- root/root    usr/include/libavutil/spherical.h
 -rw-r--r-- root/root    usr/include/libavutil/stereo3d.h
+-rw-r--r-- root/root    usr/include/libavutil/tdrdi.h
 -rw-r--r-- root/root    usr/include/libavutil/tea.h
 -rw-r--r-- root/root    usr/include/libavutil/threadmessage.h
 -rw-r--r-- root/root    usr/include/libavutil/time.h
@@ -141,10 +145,6 @@ drwxr-xr-x root/root    usr/include/libavutil/
 -rw-r--r-- root/root    usr/include/libavutil/video_enc_params.h
 -rw-r--r-- root/root    usr/include/libavutil/video_hint.h
 -rw-r--r-- root/root    usr/include/libavutil/xtea.h
-drwxr-xr-x root/root    usr/include/libpostproc/
--rw-r--r-- root/root    usr/include/libpostproc/postprocess.h
--rw-r--r-- root/root    usr/include/libpostproc/version.h
--rw-r--r-- root/root    usr/include/libpostproc/version_major.h
 drwxr-xr-x root/root    usr/include/libswresample/
 -rw-r--r-- root/root    usr/include/libswresample/swresample.h
 -rw-r--r-- root/root    usr/include/libswresample/version.h
@@ -154,37 +154,33 @@ drwxr-xr-x root/root    usr/include/libswscale/
 -rw-r--r-- root/root    usr/include/libswscale/version.h
 -rw-r--r-- root/root    usr/include/libswscale/version_major.h
 drwxr-xr-x root/root    usr/lib/
-lrwxrwxrwx root/root    usr/lib/libavcodec.so -> libavcodec.so.61.19.101
-lrwxrwxrwx root/root    usr/lib/libavcodec.so.61 -> libavcodec.so.61.19.101
--rwxr-xr-x root/root    usr/lib/libavcodec.so.61.19.101
-lrwxrwxrwx root/root    usr/lib/libavdevice.so -> libavdevice.so.61.3.100
-lrwxrwxrwx root/root    usr/lib/libavdevice.so.61 -> libavdevice.so.61.3.100
--rwxr-xr-x root/root    usr/lib/libavdevice.so.61.3.100
-lrwxrwxrwx root/root    usr/lib/libavfilter.so -> libavfilter.so.10.4.100
-lrwxrwxrwx root/root    usr/lib/libavfilter.so.10 -> libavfilter.so.10.4.100
--rwxr-xr-x root/root    usr/lib/libavfilter.so.10.4.100
-lrwxrwxrwx root/root    usr/lib/libavformat.so -> libavformat.so.61.7.100
-lrwxrwxrwx root/root    usr/lib/libavformat.so.61 -> libavformat.so.61.7.100
--rwxr-xr-x root/root    usr/lib/libavformat.so.61.7.100
-lrwxrwxrwx root/root    usr/lib/libavutil.so -> libavutil.so.59.39.100
-lrwxrwxrwx root/root    usr/lib/libavutil.so.59 -> libavutil.so.59.39.100
--rwxr-xr-x root/root    usr/lib/libavutil.so.59.39.100
-lrwxrwxrwx root/root    usr/lib/libpostproc.so -> libpostproc.so.58.3.100
-lrwxrwxrwx root/root    usr/lib/libpostproc.so.58 -> libpostproc.so.58.3.100
--rwxr-xr-x root/root    usr/lib/libpostproc.so.58.3.100
-lrwxrwxrwx root/root    usr/lib/libswresample.so -> libswresample.so.5.3.100
-lrwxrwxrwx root/root    usr/lib/libswresample.so.5 -> libswresample.so.5.3.100
--rwxr-xr-x root/root    usr/lib/libswresample.so.5.3.100
-lrwxrwxrwx root/root    usr/lib/libswscale.so -> libswscale.so.8.3.100
-lrwxrwxrwx root/root    usr/lib/libswscale.so.8 -> libswscale.so.8.3.100
--rwxr-xr-x root/root    usr/lib/libswscale.so.8.3.100
+lrwxrwxrwx root/root    usr/lib/libavcodec.so -> libavcodec.so.62.11.100
+lrwxrwxrwx root/root    usr/lib/libavcodec.so.62 -> libavcodec.so.62.11.100
+-rwxr-xr-x root/root    usr/lib/libavcodec.so.62.11.100
+lrwxrwxrwx root/root    usr/lib/libavdevice.so -> libavdevice.so.62.1.100
+lrwxrwxrwx root/root    usr/lib/libavdevice.so.62 -> libavdevice.so.62.1.100
+-rwxr-xr-x root/root    usr/lib/libavdevice.so.62.1.100
+lrwxrwxrwx root/root    usr/lib/libavfilter.so -> libavfilter.so.11.4.100
+lrwxrwxrwx root/root    usr/lib/libavfilter.so.11 -> libavfilter.so.11.4.100
+-rwxr-xr-x root/root    usr/lib/libavfilter.so.11.4.100
+lrwxrwxrwx root/root    usr/lib/libavformat.so -> libavformat.so.62.3.100
+lrwxrwxrwx root/root    usr/lib/libavformat.so.62 -> libavformat.so.62.3.100
+-rwxr-xr-x root/root    usr/lib/libavformat.so.62.3.100
+lrwxrwxrwx root/root    usr/lib/libavutil.so -> libavutil.so.60.8.100
+lrwxrwxrwx root/root    usr/lib/libavutil.so.60 -> libavutil.so.60.8.100
+-rwxr-xr-x root/root    usr/lib/libavutil.so.60.8.100
+lrwxrwxrwx root/root    usr/lib/libswresample.so -> libswresample.so.6.1.100
+lrwxrwxrwx root/root    usr/lib/libswresample.so.6 -> libswresample.so.6.1.100
+-rwxr-xr-x root/root    usr/lib/libswresample.so.6.1.100
+lrwxrwxrwx root/root    usr/lib/libswscale.so -> libswscale.so.9.1.100
+lrwxrwxrwx root/root    usr/lib/libswscale.so.9 -> libswscale.so.9.1.100
+-rwxr-xr-x root/root    usr/lib/libswscale.so.9.1.100
 drwxr-xr-x root/root    usr/lib/pkgconfig/
 -rw-r--r-- root/root    usr/lib/pkgconfig/libavcodec.pc
 -rw-r--r-- root/root    usr/lib/pkgconfig/libavdevice.pc
 -rw-r--r-- root/root    usr/lib/pkgconfig/libavfilter.pc
 -rw-r--r-- root/root    usr/lib/pkgconfig/libavformat.pc
 -rw-r--r-- root/root    usr/lib/pkgconfig/libavutil.pc
--rw-r--r-- root/root    usr/lib/pkgconfig/libpostproc.pc
 -rw-r--r-- root/root    usr/lib/pkgconfig/libswresample.pc
 -rw-r--r-- root/root    usr/lib/pkgconfig/libswscale.pc
 drwxr-xr-x root/root    usr/share/
@@ -235,8 +231,6 @@ 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/ffmpeg/abuild b/ffmpeg/abuild
index e86b26f4..efd6c76f 100644
--- a/ffmpeg/abuild
+++ b/ffmpeg/abuild
@@ -1,8 +1,8 @@
 name=ffmpeg
-version=7.1.1
+version=8.0
 release=1
 source="https://$name.org/releases/$name-$version.tar.xz
-	gcc-14.patch"
+	libressl.patch"
 
 build() {
 	./configure \
diff --git a/ffmpeg/gcc-14.patch b/ffmpeg/gcc-14.patch
deleted file mode 100644
index c9ab18c7..00000000
--- a/ffmpeg/gcc-14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
diff --git a/ffmpeg/libressl.patch b/ffmpeg/libressl.patch
new file mode 100644
index 00000000..17398d4b
--- /dev/null
+++ b/ffmpeg/libressl.patch
@@ -0,0 +1,33 @@
+--- ffmpeg-8.0-orig/libavformat/tls_openssl.c
++++ ffmpeg-8.0/libavformat/tls_openssl.c
+@@ -716,7 +716,7 @@
+     }
+ 
+     /* Check whether the handshake is completed. */
+-    if (SSL_is_init_finished(p->ssl) != TLS_ST_OK)
++    if (!SSL_is_init_finished(p->ssl))
+         goto end;
+ 
+     ret = 0;
+@@ -869,7 +869,9 @@
+         c->mtu = 1096;
+     SSL_set_options(p->ssl, SSL_OP_NO_QUERY_MTU);
+     SSL_set_mtu(p->ssl, c->mtu);
+-    DTLS_set_link_mtu(p->ssl, c->mtu);
++    #ifndef LIBRESSL_VERSION_NUMBER
++        DTLS_set_link_mtu(p->ssl, c->mtu);
++    #endif
+     init_bio_method(h);
+     if (p->tls_shared.external_sock != 1) {
+         if ((ret = ff_tls_open_underlying(&p->tls_shared, h, url, options)) < 0) {
+@@ -1009,7 +1011,9 @@
+     uc->flags |= h->flags & AVIO_FLAG_NONBLOCK;
+ 
+     if (c->tls_shared.is_dtls)
+-        size = FFMIN(size, DTLS_get_data_mtu(c->ssl));
++        #ifndef LIBRESSL_VERSION_NUMBER
++            size = FFMIN(size, DTLS_get_data_mtu(c->ssl));
++        #endif
+ 
+     ret = SSL_write(c->ssl, buf, size);
+     if (ret > 0)