From 52a4b1748b500bf0738a18fd2a4a8227a9fca715 Mon Sep 17 00:00:00 2001 From: Woodpecker CI Date: Thu, 19 Mar 2026 07:50:30 +0000 Subject: Woodpecker CI 9d24f4d3c03c15ed8e0e597668de8e5c8f407aff [SKIP CI] --- ffmpeg/.checksum | 3 +-- ffmpeg/.files | 43 ++++++++++++++++++++++--------------------- ffmpeg/abuild | 7 +++---- ffmpeg/libressl.patch | 33 --------------------------------- 4 files changed, 26 insertions(+), 60 deletions(-) delete mode 100644 ffmpeg/libressl.patch (limited to 'ffmpeg') diff --git a/ffmpeg/.checksum b/ffmpeg/.checksum index b1c1d99a..206a9a3f 100644 --- a/ffmpeg/.checksum +++ b/ffmpeg/.checksum @@ -1,2 +1 @@ -9b0da96f97d9e7c23e7df73d348e7491030e8ed51dcc491ee029dc8785350997 ffmpeg-8.0.1.tar.xz -c9e63a5b7cebaa80cdb3cad774261fb2a5acfee9e91e5943cfbb50cfbdb4bc61 libressl.patch +ed01e129fa80964e38c015bb388ab1beff0d458cb03dbed2edfb6d61fd41c93f ffmpeg-8.1.tar.xz diff --git a/ffmpeg/.files b/ffmpeg/.files index 24ffee02..f9924a8b 100644 --- a/ffmpeg/.files +++ b/ffmpeg/.files @@ -18,6 +18,7 @@ drwxr-xr-x root/root usr/include/libavcodec/ -rw-r--r-- root/root usr/include/libavcodec/dirac.h -rw-r--r-- root/root usr/include/libavcodec/dv_profile.h -rw-r--r-- root/root usr/include/libavcodec/dxva2.h +-rw-r--r-- root/root usr/include/libavcodec/exif.h -rw-r--r-- root/root usr/include/libavcodec/jni.h -rw-r--r-- root/root usr/include/libavcodec/mediacodec.h -rw-r--r-- root/root usr/include/libavcodec/packet.h @@ -154,27 +155,27 @@ 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.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 +lrwxrwxrwx root/root usr/lib/libavcodec.so -> libavcodec.so.62.28.100 +lrwxrwxrwx root/root usr/lib/libavcodec.so.62 -> libavcodec.so.62.28.100 +-rwxr-xr-x root/root usr/lib/libavcodec.so.62.28.100 +lrwxrwxrwx root/root usr/lib/libavdevice.so -> libavdevice.so.62.3.100 +lrwxrwxrwx root/root usr/lib/libavdevice.so.62 -> libavdevice.so.62.3.100 +-rwxr-xr-x root/root usr/lib/libavdevice.so.62.3.100 +lrwxrwxrwx root/root usr/lib/libavfilter.so -> libavfilter.so.11.14.100 +lrwxrwxrwx root/root usr/lib/libavfilter.so.11 -> libavfilter.so.11.14.100 +-rwxr-xr-x root/root usr/lib/libavfilter.so.11.14.100 +lrwxrwxrwx root/root usr/lib/libavformat.so -> libavformat.so.62.12.100 +lrwxrwxrwx root/root usr/lib/libavformat.so.62 -> libavformat.so.62.12.100 +-rwxr-xr-x root/root usr/lib/libavformat.so.62.12.100 +lrwxrwxrwx root/root usr/lib/libavutil.so -> libavutil.so.60.26.100 +lrwxrwxrwx root/root usr/lib/libavutil.so.60 -> libavutil.so.60.26.100 +-rwxr-xr-x root/root usr/lib/libavutil.so.60.26.100 +lrwxrwxrwx root/root usr/lib/libswresample.so -> libswresample.so.6.3.100 +lrwxrwxrwx root/root usr/lib/libswresample.so.6 -> libswresample.so.6.3.100 +-rwxr-xr-x root/root usr/lib/libswresample.so.6.3.100 +lrwxrwxrwx root/root usr/lib/libswscale.so -> libswscale.so.9.5.100 +lrwxrwxrwx root/root usr/lib/libswscale.so.9 -> libswscale.so.9.5.100 +-rwxr-xr-x root/root usr/lib/libswscale.so.9.5.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 diff --git a/ffmpeg/abuild b/ffmpeg/abuild index 368a9c78..7dff2344 100644 --- a/ffmpeg/abuild +++ b/ffmpeg/abuild @@ -1,8 +1,7 @@ name=ffmpeg -version=8.0.1 +version=8.1 release=1 -source="https://$name.org/releases/$name-$version.tar.xz - libressl.patch" +source="https://$name.org/releases/$name-$version.tar.xz" build() { ./configure \ @@ -23,7 +22,7 @@ build() { --enable-libvpx \ --enable-libx264 \ --enable-libx265 \ - --enable-openssl + --enable-libtls make make install } diff --git a/ffmpeg/libressl.patch b/ffmpeg/libressl.patch deleted file mode 100644 index 17398d4b..00000000 --- a/ffmpeg/libressl.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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) -- cgit v1.2.3