From 0e9264156ba2509d5bd66a1ba7be2f3ba2ccf0f1 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 15 Feb 2024 13:38:35 -0500 Subject: [PATCH] vlc: drop libplacebo dependency; rebuild for protobuf, grpc --- srcpkgs/vlc/patches/libplacebo-5.patch | 110 ------------------------- srcpkgs/vlc/template | 15 ++-- 2 files changed, 7 insertions(+), 118 deletions(-) delete mode 100644 srcpkgs/vlc/patches/libplacebo-5.patch diff --git a/srcpkgs/vlc/patches/libplacebo-5.patch b/srcpkgs/vlc/patches/libplacebo-5.patch deleted file mode 100644 index 3dce0889be0..00000000000 --- a/srcpkgs/vlc/patches/libplacebo-5.patch +++ /dev/null @@ -1,110 +0,0 @@ -Taken from https://git.alpinelinux.org/aports/plain/community/vlc/libplacebo-5.patch. - -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 - #include - -+#include -+#include -+ - /* 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/srcpkgs/vlc/template b/srcpkgs/vlc/template index bdd0cc414dc..559b1c4fff3 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,11 +1,11 @@ # Template file for 'vlc' pkgname=vlc version=3.0.20 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --enable-live555 --disable-fluidsynth --enable-dvdread - --enable-flac --enable-merge-ffmpeg + --enable-flac --enable-merge-ffmpeg --disable-libplacebo $(vopt_enable notify) $(vopt_enable qt) $(vopt_enable x265) $(vopt_enable svg) $(vopt_enable v4l2) $(vopt_enable smb smbclient) $(vopt_enable lua) $(vopt_enable vaapi libva) $(vopt_enable vdpau) @@ -29,12 +29,11 @@ makedepends=" gnutls-devel jack-devel liba52-devel libass-devel libbluray-devel libcdio-devel libdca-devel libdvbpsi-devel libdvdnav-devel libmad-devel libmatroska-devel libmodplug-devel libmpcdec-devel libmpeg2-devel - libmtp-devel libplacebo-devel libproxy-devel libsamplerate-devel - libSM-devel libsysfs-devel libtheora-devel libupnp-devel - libXinerama-devel libXpm-devel libXvMC-devel ncurses-devel opus-devel pulseaudio-devel - sndio-devel speex-devel taglib-devel wayland-protocols x264-devel - xcb-util-devel xcb-util-keysyms-devel live555-devel libdvdread-devel - chromaprint-devel + libmtp-devel libproxy-devel libsamplerate-devel libSM-devel libsysfs-devel + libtheora-devel libupnp-devel libXinerama-devel libXpm-devel libXvMC-devel + ncurses-devel opus-devel pulseaudio-devel sndio-devel speex-devel taglib-devel + wayland-protocols x264-devel xcb-util-devel xcb-util-keysyms-devel + live555-devel libdvdread-devel chromaprint-devel $(vopt_if notify libnotify-devel) $(vopt_if opengl MesaLib-devel) $(vopt_if qt qt5-x11extras-devel) $(vopt_if qt qt5-svg-devel) $(vopt_if v4l2 v4l-utils-devel) $(vopt_if smb samba-devel)