Woodpecker CI 17064f0bb521a139eec7d69748cf4267cd4531c4 [SKIP CI]

6 files changed, 58 insertions, 20 deletions

diff --git a/irssi/.files b/irssi/.files
index bd0b51b9..6fc508e5 100644
--- a/irssi/.files
+++ b/irssi/.files
@@ -160,22 +160,22 @@ drwxr-xr-x root/root    usr/lib/irssi/modules/
 -rwxr-xr-x root/root    usr/lib/irssi/modules/libperl_core.so
 drwxr-xr-x root/root    usr/lib/perl5/
 drwxr-xr-x root/root    usr/lib/perl5/site_perl/
-drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.40/
-drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.40/x86_64-linux-thread-multi/
--rw-r--r-- root/root    usr/lib/perl5/site_perl/5.40/x86_64-linux-thread-multi/Irssi.pm
-drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.40/x86_64-linux-thread-multi/Irssi/
--rw-r--r-- root/root    usr/lib/perl5/site_perl/5.40/x86_64-linux-thread-multi/Irssi/Irc.pm
--rw-r--r-- root/root    usr/lib/perl5/site_perl/5.40/x86_64-linux-thread-multi/Irssi/TextUI.pm
--rw-r--r-- root/root    usr/lib/perl5/site_perl/5.40/x86_64-linux-thread-multi/Irssi/UI.pm
-drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.40/x86_64-linux-thread-multi/auto/
-drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.40/x86_64-linux-thread-multi/auto/Irssi/
-drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.40/x86_64-linux-thread-multi/auto/Irssi/Irc/
--rwxr-xr-x root/root    usr/lib/perl5/site_perl/5.40/x86_64-linux-thread-multi/auto/Irssi/Irc/Irc.so
--rwxr-xr-x root/root    usr/lib/perl5/site_perl/5.40/x86_64-linux-thread-multi/auto/Irssi/Irssi.so
-drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.40/x86_64-linux-thread-multi/auto/Irssi/TextUI/
--rwxr-xr-x root/root    usr/lib/perl5/site_perl/5.40/x86_64-linux-thread-multi/auto/Irssi/TextUI/TextUI.so
-drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.40/x86_64-linux-thread-multi/auto/Irssi/UI/
--rwxr-xr-x root/root    usr/lib/perl5/site_perl/5.40/x86_64-linux-thread-multi/auto/Irssi/UI/UI.so
+drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.42/
+drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.42/x86_64-linux-thread-multi/
+-rw-r--r-- root/root    usr/lib/perl5/site_perl/5.42/x86_64-linux-thread-multi/Irssi.pm
+drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.42/x86_64-linux-thread-multi/Irssi/
+-rw-r--r-- root/root    usr/lib/perl5/site_perl/5.42/x86_64-linux-thread-multi/Irssi/Irc.pm
+-rw-r--r-- root/root    usr/lib/perl5/site_perl/5.42/x86_64-linux-thread-multi/Irssi/TextUI.pm
+-rw-r--r-- root/root    usr/lib/perl5/site_perl/5.42/x86_64-linux-thread-multi/Irssi/UI.pm
+drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.42/x86_64-linux-thread-multi/auto/
+drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.42/x86_64-linux-thread-multi/auto/Irssi/
+drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.42/x86_64-linux-thread-multi/auto/Irssi/Irc/
+-rwxr-xr-x root/root    usr/lib/perl5/site_perl/5.42/x86_64-linux-thread-multi/auto/Irssi/Irc/Irc.so
+-rwxr-xr-x root/root    usr/lib/perl5/site_perl/5.42/x86_64-linux-thread-multi/auto/Irssi/Irssi.so
+drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.42/x86_64-linux-thread-multi/auto/Irssi/TextUI/
+-rwxr-xr-x root/root    usr/lib/perl5/site_perl/5.42/x86_64-linux-thread-multi/auto/Irssi/TextUI/TextUI.so
+drwxr-xr-x root/root    usr/lib/perl5/site_perl/5.42/x86_64-linux-thread-multi/auto/Irssi/UI/
+-rwxr-xr-x root/root    usr/lib/perl5/site_perl/5.42/x86_64-linux-thread-multi/auto/Irssi/UI/UI.so
 drwxr-xr-x root/root    usr/lib/pkgconfig/
 -rw-r--r-- root/root    usr/lib/pkgconfig/irssi-1.pc
 drwxr-xr-x root/root    usr/share/
diff --git a/irssi/abuild b/irssi/abuild
index e58e2eb6..7bcece5c 100644
--- a/irssi/abuild
+++ b/irssi/abuild
@@ -6,5 +6,5 @@ build_opt="-Denable-true-color=yes"
 
 postbuild() {
 	mkdir -p $PKG/etc/revdep.d/
-	echo /usr/lib/perl5/5.40/x86_64-linux-thread-multi/CORE > $PKG/etc/revdep.d/$name
+	echo /usr/lib/perl5/5.42/x86_64-linux-thread-multi/CORE > $PKG/etc/revdep.d/$name
 }
diff --git a/mpv/.checksum b/mpv/.checksum
index 85a26db0..18c033c8 100644
--- a/mpv/.checksum
+++ b/mpv/.checksum
@@ -1 +1,2 @@
+01c43327c42143e0c8645f66e78023fea95bfdb1c49d6522c45c7ce20dcef184  ffmpeg8.patch
 c698a9e6acc7df68a88a422aa50ce6716a9fd94b8b99c854bb3dd3594d59a6c2  mpv-0.40.0.tar.gz
diff --git a/mpv/abuild b/mpv/abuild
index 1c9979e8..b70b7327 100644
--- a/mpv/abuild
+++ b/mpv/abuild
@@ -1,9 +1,9 @@
 name=mpv
 version=0.40.0
 release=1
-source="https://github.com/${name}-player/${name}/archive/v${version}/${name}-${version}.tar.gz"
+source="https://github.com/${name}-player/${name}/archive/v${version}/${name}-${version}.tar.gz
+	ffmpeg8.patch"
 build_opt="-Dwayland=enabled"
-[ -f $SPM_PKGDB/libx11 ] && build_opt="$build_opt -Dx11=enabled"
 
 postbuild() {
 	rm -r \
diff --git a/mpv/ffmpeg8.patch b/mpv/ffmpeg8.patch
new file mode 100644
index 00000000..66c9b791
--- /dev/null
+++ b/mpv/ffmpeg8.patch
@@ -0,0 +1,37 @@
+Patch-Source: https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9
+---
+From 26b29fba02a2782f68e2906f837d21201fc6f1b9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
+Date: Fri, 28 Mar 2025 19:12:01 +0100
+Subject: [PATCH] demux_mkv: fix compilation after deprecated definitions
+ removal
+
+See: https://github.com/FFmpeg/FFmpeg/commit/822432769868da325ba03774df1084aa78b9a5a0
+---
+ demux/demux_mkv.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
+index 135edcc23d82b..cc7ce3e98f4f6 100644
+--- a/demux/demux_mkv.c
++++ b/demux/demux_mkv.c
+@@ -2200,16 +2200,16 @@ static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_track_t *track)
+             // [0x30..0x37] are component tags utilized for
+             // non-mobile captioning service ("profile A").
+             if (component_tag >= 0x30 && component_tag <= 0x37)
+-                lav->profile = FF_PROFILE_ARIB_PROFILE_A;
++                lav->profile = AV_PROFILE_ARIB_PROFILE_A;
+             break;
+         case 0x0012:
+             // component tag 0x87 signifies a mobile/partial reception
+             // (1seg) captioning service ("profile C").
+             if (component_tag == 0x87)
+-                lav->profile = FF_PROFILE_ARIB_PROFILE_C;
++                lav->profile = AV_PROFILE_ARIB_PROFILE_C;
+             break;
+         }
+-        if (lav->profile == FF_PROFILE_UNKNOWN)
++        if (lav->profile == AV_PROFILE_UNKNOWN)
+             MP_WARN(demuxer, "ARIB caption profile %02x / %04x not supported.\n",
+                     component_tag, data_component_id);
+     }
diff --git a/x264/abuild b/x264/abuild
index bafbcea6..133e270a 100644
--- a/x264/abuild
+++ b/x264/abuild
@@ -3,4 +3,4 @@ version=20240216
 release=1
 source="https://anduin.linuxfromscratch.org/BLFS/$name/$name-$version.tar.xz
 	portability.patch"
-build_opt="--enable-shared"
+build_opt="--enable-shared --disable-lavf"