From: Jakub Bogusz Date: Mon, 10 Apr 2023 20:10:16 +0000 (+0200) Subject: - added libplacebo-5 patch from Arch; release 2 X-Git-Tag: auto/th/vlc-3.0.18-2 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fvlc.git;a=commitdiff_plain;h=387d11ecc05acaddd90871ab6fa846379646afdc - added libplacebo-5 patch from Arch; release 2 --- diff --git a/vlc-libplacebo-5.patch b/vlc-libplacebo-5.patch new file mode 100644 index 0000000..006e900 --- /dev/null +++ b/vlc-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 + #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/vlc.spec b/vlc.spec index 17c8991..f64f440 100644 --- a/vlc.spec +++ b/vlc.spec @@ -71,7 +71,7 @@ Summary: VLC - a multimedia player and stream server Summary(pl.UTF-8): VLC - odtwarzacz multimedialny oraz serwer strumieni Name: vlc Version: 3.0.18 -Release: 1 +Release: 2 License: GPL v2+ Group: X11/Applications/Multimedia Source0: https://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz @@ -85,6 +85,7 @@ Patch5: %{name}-fdk_aac.patch Patch7: %{name}-vsxu.patch Patch8: qt-5.15.patch Patch9: x32.patch +Patch10: %{name}-libplacebo-5.patch Patch11: opencv4.patch URL: http://www.videolan.org/vlc/ %{?with_decklink:BuildRequires: Blackmagic_DeckLink_SDK} @@ -168,7 +169,7 @@ BuildRequires: libmtp-devel >= 1.0.0 %{?with_notify:BuildRequires: libnotify-devel} BuildRequires: libnfs-devel >= 1.10.0 BuildRequires: libogg-devel >= 1:1.0 -%{?with_libplacebo:BuildRequires: libplacebo-devel >= 0.2.1} +%{?with_libplacebo:BuildRequires: libplacebo-devel >= 4} BuildRequires: libpng-devel %{?with_projectM:BuildRequires: libprojectM-devel >= 2.0.1-3} BuildRequires: libproxy-devel @@ -271,7 +272,7 @@ Requires: libmpeg2 > 0.3.2 Requires: libmtp >= 1.0.0 Requires: libnfs >= 1.10.0 Requires: libogg >= 1:1.0 -%{?with_libplacebo:Requires: libplacebo >= 0.2.1} +%{?with_libplacebo:Requires: libplacebo >= 4} %{?with_svg:Requires: librsvg >= 2.9.0} Requires: libsecret >= 0.18 %{?with_smb2:Requires: libsmb2 >= 4.0.0} @@ -432,6 +433,7 @@ Akcje klienta VLC dla Solid. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %patch11 -p1 %build