git » vlc.git » commit fbf315e

diff --git a/PKGBUILD b/PKGBUILD
index 6aec552..9c6539e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ _vlcver=3.0.20
 # optional fixup version including hyphen
 _vlcfixupver=
 pkgver=${_vlcver}${_vlcfixupver//-/.r}
-pkgrel=2
+pkgrel=3
 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
 url='https://www.videolan.org/vlc/'
 arch=('x86_64')
@@ -19,7 +19,7 @@ depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua' 'libidn'
          'libmpeg2' 'xcb-util-keysyms' 'libtar' 'libxinerama' 'libsecret'
          'libupnp' 'libixml.so' 'libupnp.so' 'libarchive' 'qt5-base'
          'qt5-x11extras' 'qt5-svg' 'freetype2' 'fribidi' 'harfbuzz'
-         'fontconfig' 'libxml2' 'gnutls' 'libplacebo' 'aribb24')
+         'fontconfig' 'libxml2' 'gnutls' 'aribb24')
 makedepends=('gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
              'flac' 'libdc1394' 'libavc1394' 'libcaca' 'gtk3'
              'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi' 'systemd-libs'
@@ -101,11 +101,9 @@ conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 options=('!emptydirs')
 source=(https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
-        libplacebo-5.patch
         update-vlc-plugin-cache.hook)
 sha512sums=('02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406'
             'SKIP'
-            'a06b04a8b059dbbef77d27435bd5bec3c26f937390bd112b0843385587e866e617c3dd0e66f99eed5fa4a91bc5f0fd9b5623f65b2f2435a54456dde2aa96209b'
             'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3')
 validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
 
@@ -228,7 +226,7 @@ build() {
     --enable-kwallet \
     --disable-update-check \
     --enable-notify \
-    --enable-libplacebo \
+    --disable-libplacebo \
     --enable-vlc \
     --enable-aribsub \
     --enable-aribcam \
diff --git a/libplacebo-5.patch b/libplacebo-5.patch
deleted file mode 100644
index 006e900..0000000
--- a/libplacebo-5.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-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
-         }
-     }