Update to version 3.0.18

7 files changed, 123 insertions, 310 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bcbcd55d795b..55b2968cb27e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vlc-nox
 	pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player (without X support)
-	pkgver = 3.0.17.4
-	pkgrel = 2
+	pkgver = 3.0.18
+	pkgrel = 1
 	url = https://www.videolan.org/vlc/
 	arch = x86_64
 	license = LGPL2.1
@@ -160,17 +160,13 @@ pkgbase = vlc-nox
 	replaces = vlc-plugin
 	replaces = vlc-git
 	options = !emptydirs
-	source = http://download.videolan.org/vlc/3.0.17.4/vlc-3.0.17.4.tar.xz
+	source = http://download.videolan.org/vlc/3.0.18/vlc-3.0.18.tar.xz
+	source = libplacebo-5.patch
 	source = update-vlc-plugin-cache.hook
-	source = caca-fix-to-newer-version.patch
 	source = vlc-live-media-2021.patch
-	source = dav1d_v1.patch
-	source = dav1d_v1_limit.patch
-	sha512sums = dac14c6586603c064294672eb878253e52b3a7bef431fb10303345e5400591b5c1f2d452a2af03f503db0ca186582a84be06fdf05ab011c33f7b0bd5389c51fb
+	sha512sums = 6fc8fdaa7e8862ad7133d69b3dab99ab9cd3945846a6ce5e2379b7f68ee9accd385c53b8573fc7c82f732c24678b4932b1154d2ad8accf06305f2f578d6fcd8e
+	sha512sums = a06b04a8b059dbbef77d27435bd5bec3c26f937390bd112b0843385587e866e617c3dd0e66f99eed5fa4a91bc5f0fd9b5623f65b2f2435a54456dde2aa96209b
 	sha512sums = b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3
-	sha512sums = ef479a246dc98f882a05ca56a1c2872cc67ced154c625790070b887858ddc250d55b1295db82c9122e5ecd3c2c9c712ec9718e28d0a9d21ff6a230eb6c5010ce
-	sha512sums = ad17d6f4f2cc83841c1c89623c339ec3ee94f6084ea980e2c8cbc3903854c85e5396e31bfd8dc90745b41794670903d854c4d282d8adec263087a9d47b226ccc
-	sha512sums = 5f7aa43a7b248812758a8ef82d15d59fb566327fc3e837002a8f4741cabde09ed7caca905f6fe168554b9a4b7561816b3eff877f4dd6664ceaf0964281facb4f
-	sha512sums = 4aca4979fe7516ee9d39ae8e2c91c0f981a033ed5c6a74eaf86569df8bbcf72ab0be037f27c8af78f26c23dc181e52bbf4a3e0209e07160fdb03e8fa33e6bc38
+	sha512sums = 322461cb5e89e4828483dd0a5c6595f99e767885ae9a1aa2e4d0514ac7354f2ee93b3e5c80993dcff7cd218d7af210374724337b3fc8bc196d35ef5e2b41695d
 
 pkgname = vlc-nox
diff --git a/PKGBUILD b/PKGBUILD
index 179d363d48ea..5859e391bf01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 
 _pkgbase=vlc
 pkgname=vlc-nox
-pkgver=3.0.17.4
-pkgrel=2
+pkgver=3.0.18
+pkgrel=1
 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player (without X support)'
 url='https://www.videolan.org/vlc/'
 arch=('x86_64')
@@ -96,26 +96,20 @@ conflicts=('vlc' 'vlc-plugin' 'vlc-git')
 replaces=('vlc' 'vlc-plugin' 'vlc-git')
 options=('!emptydirs')
 source=(http://download.videolan.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}.tar.xz
+        libplacebo-5.patch
         update-vlc-plugin-cache.hook
-        caca-fix-to-newer-version.patch
-        vlc-live-media-2021.patch
-        dav1d_v1.patch
-        dav1d_v1_limit.patch)
-sha512sums=('dac14c6586603c064294672eb878253e52b3a7bef431fb10303345e5400591b5c1f2d452a2af03f503db0ca186582a84be06fdf05ab011c33f7b0bd5389c51fb'
+        vlc-live-media-2021.patch)
+sha512sums=('6fc8fdaa7e8862ad7133d69b3dab99ab9cd3945846a6ce5e2379b7f68ee9accd385c53b8573fc7c82f732c24678b4932b1154d2ad8accf06305f2f578d6fcd8e'
+            'a06b04a8b059dbbef77d27435bd5bec3c26f937390bd112b0843385587e866e617c3dd0e66f99eed5fa4a91bc5f0fd9b5623f65b2f2435a54456dde2aa96209b'
             'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3'
-            'ef479a246dc98f882a05ca56a1c2872cc67ced154c625790070b887858ddc250d55b1295db82c9122e5ecd3c2c9c712ec9718e28d0a9d21ff6a230eb6c5010ce'
-            'ad17d6f4f2cc83841c1c89623c339ec3ee94f6084ea980e2c8cbc3903854c85e5396e31bfd8dc90745b41794670903d854c4d282d8adec263087a9d47b226ccc'
-            '5f7aa43a7b248812758a8ef82d15d59fb566327fc3e837002a8f4741cabde09ed7caca905f6fe168554b9a4b7561816b3eff877f4dd6664ceaf0964281facb4f'
-            '4aca4979fe7516ee9d39ae8e2c91c0f981a033ed5c6a74eaf86569df8bbcf72ab0be037f27c8af78f26c23dc181e52bbf4a3e0209e07160fdb03e8fa33e6bc38')
+            '322461cb5e89e4828483dd0a5c6595f99e767885ae9a1aa2e4d0514ac7354f2ee93b3e5c80993dcff7cd218d7af210374724337b3fc8bc196d35ef5e2b41695d')
 
 prepare() {
   cd "${srcdir}/${_pkgbase}-${pkgver}"
   sed -e 's:truetype/ttf-dejavu:TTF:g' -i modules/visualization/projectm.cpp
   sed -e 's|-Werror-implicit-function-declaration||g' -i configure
-  patch -Np1 < "${srcdir}/caca-fix-to-newer-version.patch"
+  patch -Np1 < "${srcdir}/libplacebo-5.patch"
   patch -Np1 < "${srcdir}/vlc-live-media-2021.patch"
-  patch -Np1 < "${srcdir}/dav1d_v1.patch"
-  patch -Np1 < "${srcdir}/dav1d_v1_limit.patch"
   sed 's|whoami|echo builduser|g' -i configure
   sed 's|hostname -f|echo arch|g' -i configure
   autoreconf -vf
diff --git a/caca-fix-to-newer-version.patch b/caca-fix-to-newer-version.patch
deleted file mode 100644
index 8a56f767a1b0..000000000000
--- a/caca-fix-to-newer-version.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 900318072a7ebce28745aa3863e1364b7258baff Mon Sep 17 00:00:00 2001
-From: Alexandre Janniaux <ajanni@videolabs.io>
-Date: Wed, 10 Nov 2021 15:37:52 +0100
-Subject: [PATCH] caca: fix to newer version
-
-Migrate to the new API instead of libcucul API, which has been merged
-into libcaca since 0.99.beta15:
-
-    commit f61816ceb7445f8bf818936151554ac060764b39
-    Author: Sam Hocevar <sam@hocevar.net>
-    Date:   Sat Sep 27 13:12:46 2008 +0000
-
-    Starting refactoring to get rid of libcucul. The initial reason for the
-    split is rendered moot by the plugin system: when enabled, binaries do
-    not link directly with libX11 or libGL. I hope this is a step towards
-    more consisteny and clarity.
-
-It was then completely wiped out by the following commit, which is part
-of v0.99.beta20:
-
-    commit 5f0ec215f8c9915ed028324a8ecac8212f68e18d
-    Author: Sam Hocevar <sam@hocevar.net>
-    Date:   Thu May 3 10:33:30 2018 +0200
-
-    Remove legacy code from 10 years ago.
-
-(cherry picked from commit d35391caa03c046149e7fe2497f51bf59ed8551d)
----
- modules/video_output/caca.c | 30 +++++++++++++++---------------
- 1 file changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
-index 33a0409820..a2e922a864 100644
---- a/modules/video_output/caca.c
-+++ b/modules/video_output/caca.c
-@@ -74,9 +74,9 @@ static void Place(vout_display_t *, vout_display_place_t *);
- 
- /* */
- struct vout_display_sys_t {
--    cucul_canvas_t *cv;
-+    caca_canvas_t *cv;
-     caca_display_t *dp;
--    cucul_dither_t *dither;
-+    caca_dither_t *dither;
- 
-     picture_pool_t *pool;
-     vout_display_event_thread_t *et;
-@@ -153,9 +153,9 @@ static int Open(vlc_object_t *object)
-     if (!sys)
-         goto error;
- 
--    sys->cv = cucul_create_canvas(0, 0);
-+    sys->cv = caca_create_canvas(0, 0);
-     if (!sys->cv) {
--        msg_Err(vd, "cannot initialize libcucul");
-+        msg_Err(vd, "cannot initialize libcaca");
-         goto error;
-     }
- 
-@@ -209,11 +209,11 @@ error:
-         if (sys->pool)
-             picture_pool_Release(sys->pool);
-         if (sys->dither)
--            cucul_free_dither(sys->dither);
-+            caca_free_dither(sys->dither);
-         if (sys->dp)
-             caca_free_display(sys->dp);
-         if (sys->cv)
--            cucul_free_canvas(sys->cv);
-+            caca_free_canvas(sys->cv);
- 
-         free(sys);
-     }
-@@ -235,9 +235,9 @@ static void Close(vlc_object_t *object)
-     if (sys->pool)
-         picture_pool_Release(sys->pool);
-     if (sys->dither)
--        cucul_free_dither(sys->dither);
-+        caca_free_dither(sys->dither);
-     caca_free_display(sys->dp);
--    cucul_free_canvas(sys->cv);
-+    caca_free_canvas(sys->cv);
- 
- #if defined(_WIN32)
-     FreeConsole();
-@@ -266,7 +266,7 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
- 
-     if (!sys->dither) {
-         /* Create the libcaca dither object */
--        sys->dither = cucul_create_dither(32,
-+        sys->dither = caca_create_dither(32,
-                                             vd->source.i_visible_width,
-                                             vd->source.i_visible_height,
-                                             picture->p[0].i_pitch,
-@@ -284,12 +284,12 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
-     vout_display_place_t place;
-     Place(vd, &place);
- 
--    cucul_set_color_ansi(sys->cv, CUCUL_COLOR_DEFAULT, CUCUL_COLOR_BLACK);
--    cucul_clear_canvas(sys->cv);
-+    caca_set_color_ansi(sys->cv, CACA_DEFAULT, CACA_BLACK);
-+    caca_clear_canvas(sys->cv);
- 
-     const int crop_offset = vd->source.i_y_offset * picture->p->i_pitch +
-                             vd->source.i_x_offset * picture->p->i_pixel_pitch;
--    cucul_dither_bitmap(sys->cv, place.x, place.y,
-+    caca_dither_bitmap(sys->cv, place.x, place.y,
-                         place.width, place.height,
-                         sys->dither,
-                         &picture->p->p_pixels[crop_offset]);
-@@ -328,7 +328,7 @@ static int Control(vout_display_t *vd, int query, va_list args)
- 
-     case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
-         if (sys->dither)
--            cucul_free_dither(sys->dither);
-+            caca_free_dither(sys->dither);
-         sys->dither = NULL;
-         return VLC_SUCCESS;
- 
-@@ -366,8 +366,8 @@ static void Place(vout_display_t *vd, vout_display_place_t *place)
- 
-     vout_display_PlacePicture(place, &vd->source, vd->cfg, false);
- 
--    const int canvas_width   = cucul_get_canvas_width(sys->cv);
--    const int canvas_height  = cucul_get_canvas_height(sys->cv);
-+    const int canvas_width   = caca_get_canvas_width(sys->cv);
-+    const int canvas_height  = caca_get_canvas_height(sys->cv);
-     const int display_width  = caca_get_display_width(sys->dp);
-     const int display_height = caca_get_display_height(sys->dp);
- 
diff --git a/dav1d_v1.patch b/dav1d_v1.patch
deleted file mode 100644
index a86cfb243b8f..000000000000
--- a/dav1d_v1.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 2202c892c8dc1381b596c53c2ebd3ca680061f95 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4@ycbcr.xyz>
-Date: Fri, 18 Mar 2022 11:42:49 +0100
-Subject: [PATCH] dav1d: fix compilation with (upcoming) dav1d 1.0
-
-(cherry picked from commit dbf45cea2a8abdfbef897b8a71f3eb782bb1b712) (edited)
-edited:
-- 3.0 has the 128 pixels padding elsewhere
-- 3.0 has an extra parameter for add_integer_with_range()
-- 3.0 was setting i_extra_picture_buffers further down in the code
-- 3.0 uses 16 threads max
-
-Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
----
- modules/codec/dav1d.c | 22 +++++++++++++++++++++-
- 1 file changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/modules/codec/dav1d.c b/modules/codec/dav1d.c
-index 039165f52ec..cfabbc27cb3 100644
---- a/modules/codec/dav1d.c
-+++ b/modules/codec/dav1d.c
-@@ -63,10 +63,16 @@ vlc_module_begin ()
-     set_category(CAT_INPUT)
-     set_subcategory(SUBCAT_INPUT_VCODEC)
- 
-+#if DAV1D_API_VERSION_MAJOR >= 6
-+    add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_THREADS,
-+                THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false)
-+    add_obsolete_string("dav1d-thread-tiles") // unused with dav1d 1.0
-+#else
-     add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_FRAME_THREADS,
-                 THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false)
-     add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS,
-                 THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false)
-+#endif
- vlc_module_end ()
- 
- /*****************************************************************************
-@@ -294,6 +300,11 @@ static int OpenDecoder(vlc_object_t *p_this)
-         return VLC_ENOMEM;
- 
-     dav1d_default_settings(&p_sys->s);
-+#if DAV1D_API_VERSION_MAJOR >= 6
-+    p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-thread-frames");
-+    if (p_sys->s.n_threads == 0)
-+        p_sys->s.n_threads = (i_core_count < 16) ? i_core_count : 16;
-+#else
-     p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles");
-     if (p_sys->s.n_tile_threads == 0)
-         p_sys->s.n_tile_threads =
-@@ -303,6 +314,7 @@ static int OpenDecoder(vlc_object_t *p_this)
-     p_sys->s.n_frame_threads = var_InheritInteger(p_this, "dav1d-thread-frames");
-     if (p_sys->s.n_frame_threads == 0)
-         p_sys->s.n_frame_threads = (i_core_count < 16) ? i_core_count : 16;
-+#endif
-     p_sys->s.allocator.cookie = dec;
-     p_sys->s.allocator.alloc_picture_callback = NewPicture;
-     p_sys->s.allocator.release_picture_callback = FreePicture;
-@@ -313,12 +325,20 @@ static int OpenDecoder(vlc_object_t *p_this)
-         return VLC_EGENERIC;
-     }
- 
-+#if DAV1D_API_VERSION_MAJOR >= 6
-+    msg_Dbg(p_this, "Using dav1d version %s with %d threads",
-+            dav1d_version(), p_sys->s.n_threads);
-+
-+    dec->i_extra_picture_buffers = (p_sys->s.n_threads - 1);
-+#else
-     msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads",
-             dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads);
- 
-+    dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1);
-+#endif
-+
-     dec->pf_decode = Decode;
-     dec->pf_flush = FlushDecoder;
--    dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1);
- 
-     dec->fmt_out.video.i_width = dec->fmt_in.video.i_width;
-     dec->fmt_out.video.i_height = dec->fmt_in.video.i_height;
diff --git a/dav1d_v1_limit.patch b/dav1d_v1_limit.patch
deleted file mode 100644
index f523fe6fe148..000000000000
--- a/dav1d_v1_limit.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From d38ddd7270ffaea705981b6a48086778850d3c96 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4@ycbcr.xyz>
-Date: Mon, 21 Mar 2022 15:53:52 +0100
-Subject: [PATCH] dav1d: limit the number of extra frames needed by the decoder
-
-The i_extra_picture_buffers is used to add pictures to the pool that the core
-will allocate. dav1d is actually using n_threads frames. And the core is
-allocating 10 frames per default for AV1. So we need to add the missing ones.
-
-(cherry picked from commit a32031dc0f5f32083fc54a21397bce732742ccbe) (rebased)
-rebased:
-- the code dav1d 1.0.0 in 3.0 uses different max versions
-
-Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
----
- modules/codec/dav1d.c | 25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/modules/codec/dav1d.c b/modules/codec/dav1d.c
-index cfabbc27cb3..8a439ce4ff4 100644
---- a/modules/codec/dav1d.c
-+++ b/modules/codec/dav1d.c
-@@ -304,7 +304,28 @@ static int OpenDecoder(vlc_object_t *p_this)
-     p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-thread-frames");
-     if (p_sys->s.n_threads == 0)
-         p_sys->s.n_threads = (i_core_count < 16) ? i_core_count : 16;
--#else
-+
-+#if DAV1D_API_VERSION_MAJOR > 6 || DAV1D_API_VERSION_MINOR >= 7
-+    // after dav1d 1.0.0
-+    p_sys->s.max_frame_delay = dav1d_get_frame_delay( &p_sys->s );
-+#else // 1.0.0
-+    // corresponds to c->n_fc when max_frame_delay is 0 in dav1d 1.0.0
-+    static const uint8_t fc_lut[49] = {
-+        1,                                     /*     1 */
-+        2, 2, 2,                               /*  2- 4 */
-+        3, 3, 3, 3, 3,                         /*  5- 9 */
-+        4, 4, 4, 4, 4, 4, 4,                   /* 10-16 */
-+        5, 5, 5, 5, 5, 5, 5, 5, 5,             /* 17-25 */
-+        6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,       /* 26-36 */
-+        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, /* 37-49 */
-+    };
-+    if (p_sys->s.n_threads >= 50)
-+        p_sys->s.max_frame_delay = 8;
-+    else
-+        p_sys->s.max_frame_delay = fc_lut[p_sys->s.n_threads - 1];
-+#endif
-+
-+#else // before dav1d 1.0.0
-     p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles");
-     if (p_sys->s.n_tile_threads == 0)
-         p_sys->s.n_tile_threads =
-@@ -329,7 +350,7 @@ static int OpenDecoder(vlc_object_t *p_this)
-     msg_Dbg(p_this, "Using dav1d version %s with %d threads",
-             dav1d_version(), p_sys->s.n_threads);
- 
--    dec->i_extra_picture_buffers = (p_sys->s.n_threads - 1);
-+    dec->i_extra_picture_buffers = p_sys->s.max_frame_delay;
- #else
-     msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads",
-             dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads);
diff --git a/libplacebo-5.patch b/libplacebo-5.patch
new file mode 100644
index 000000000000..006e900bedfa
--- /dev/null
+++ b/libplacebo-5.patch
@@ -0,0 +1,108 @@
+patch vaguely ported from: https://code.videolan.org/videolan/vlc/-/merge_requests/2233
+
+diff --git a/modules/video_output/opengl/converter.h b/modules/video_output/opengl/converter.h
+index 7000e1f..49fa667 100644
+--- a/modules/video_output/opengl/converter.h
++++ b/modules/video_output/opengl/converter.h
+@@ -26,6 +26,9 @@
+ #include <vlc_picture_pool.h>
+ #include <vlc_opengl.h>
+ 
++#include <libplacebo/log.h>
++#include <libplacebo/shaders.h>
++
+ /* if USE_OPENGL_ES2 is defined, OpenGL ES version 2 will be used, otherwise
+  * normal OpenGL will be used */
+ #ifdef __APPLE__
+@@ -253,10 +256,6 @@ static inline bool HasExtension(const char *apis, const char *api)
+     return false;
+ }
+ 
+-struct pl_context;
+-struct pl_shader;
+-struct pl_shader_res;
+-
+ /*
+  * Structure that is filled by "glhw converter" module probe function
+  * The implementation should initialize every members of the struct that are
+@@ -273,7 +272,7 @@ struct opengl_tex_converter_t
+     vlc_gl_t *gl;
+ 
+     /* libplacebo context, created by the caller (optional) */
+-    struct pl_context *pl_ctx;
++    pl_log pl_log;
+ 
+     /* Function pointers to OpenGL functions, set by the caller */
+     const opengl_vtable_t *vt;
+@@ -337,7 +336,7 @@ struct opengl_tex_converter_t
+     bool yuv_color;
+     GLfloat yuv_coefficients[16];
+ 
+-    struct pl_shader *pl_sh;
++    pl_shader pl_sh;
+     const struct pl_shader_res *pl_sh_res;
+ 
+     /* Private context */
+diff --git a/modules/video_output/opengl/fragment_shaders.c b/modules/video_output/opengl/fragment_shaders.c
+index ecf7226..29f4148 100644
+--- a/modules/video_output/opengl/fragment_shaders.c
++++ b/modules/video_output/opengl/fragment_shaders.c
+@@ -611,7 +611,7 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target,
+ 
+ #ifdef HAVE_LIBPLACEBO
+     if (tc->pl_sh) {
+-        struct pl_shader *sh = tc->pl_sh;
++        pl_shader sh = tc->pl_sh;
+         struct pl_color_map_params color_params = pl_color_map_default_params;
+         color_params.intent = var_InheritInteger(tc->gl, "rendering-intent");
+         color_params.tone_mapping_algo = var_InheritInteger(tc->gl, "tone-mapping");
+@@ -634,7 +634,7 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target,
+                 pl_color_space_from_video_format(&tc->fmt),
+                 dst_space, NULL, false);
+ 
+-        struct pl_shader_obj *dither_state = NULL;
++        pl_shader_obj dither_state = NULL;
+         int method = var_InheritInteger(tc->gl, "dither-algo");
+         if (method >= 0) {
+ 
+diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
+index 13d65e0..1ee99af 100644
+--- a/modules/video_output/opengl/vout_helper.c
++++ b/modules/video_output/opengl/vout_helper.c
+@@ -570,8 +570,7 @@ opengl_deinit_program(vout_display_opengl_t *vgl, struct prgm *prgm)
+ 
+ #ifdef HAVE_LIBPLACEBO
+     FREENULL(tc->uloc.pl_vars);
+-    if (tc->pl_ctx)
+-        pl_context_destroy(&tc->pl_ctx);
++    pl_log_destroy(&tc->pl_log);
+ #endif
+ 
+     vlc_object_release(tc);
+@@ -622,21 +621,21 @@ opengl_init_program(vout_display_opengl_t *vgl, struct prgm *prgm,
+     // create the main libplacebo context
+     if (!subpics)
+     {
+-        tc->pl_ctx = pl_context_create(PL_API_VER, &(struct pl_context_params) {
++        tc->pl_log = pl_log_create(PL_API_VER, &(struct pl_log_params) {
+             .log_cb    = log_cb,
+             .log_priv  = tc,
+             .log_level = PL_LOG_INFO,
+         });
+-        if (tc->pl_ctx) {
++        if (tc->pl_log) {
+ #   if PL_API_VER >= 20
+-            tc->pl_sh = pl_shader_alloc(tc->pl_ctx, &(struct pl_shader_params) {
++            tc->pl_sh = pl_shader_alloc(tc->pl_log, &(struct pl_shader_params) {
+                 .glsl.version = tc->glsl_version,
+                 .glsl.gles = tc->is_gles,
+             });
+ #   elif PL_API_VER >= 6
+-            tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0);
++            tc->pl_sh = pl_shader_alloc(tc->pl_log, NULL, 0);
+ #   else
+-            tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0, 0);
++            tc->pl_sh = pl_shader_alloc(tc->pl_log, NULL, 0, 0);
+ #   endif
+         }
+     }
diff --git a/vlc-live-media-2021.patch b/vlc-live-media-2021.patch
index 5ca5cb30cd63..e39a6ed24408 100644
--- a/vlc-live-media-2021.patch
+++ b/vlc-live-media-2021.patch
@@ -10,17 +10,3 @@ diff -ru vlc-3.0.13.orig/configure.ac vlc-3.0.13/configure.ac
        other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic"
        AS_IF([test "${SYS}" = "mingw32"], [
          # add ws2_32 for closesocket, select, recv
-diff -ru vlc-3.0.13.orig/modules/access/live555.cpp vlc-3.0.13/modules/access/live555.cpp
---- vlc-3.0.13.orig/modules/access/live555.cpp	2019-03-29 20:01:15.000000000 +0100
-+++ vlc-3.0.13/modules/access/live555.cpp	2021-05-03 16:04:38.030121796 +0200
-@@ -852,7 +852,9 @@
-             if( !p_sys->b_multicast )
-             {
-                 /* We need different rollover behaviour for multicast */
--                p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() );
-+                struct sockaddr_storage tempAddr;
-+                sub->getConnectionEndpointAddress(tempAddr);
-+                p_sys->b_multicast = IsMulticastAddress( tempAddr );
-             }
- 
-             tk = (live_track_t*)malloc( sizeof( live_track_t ) );