diff --git a/srcpkgs/vlc/patches/libplacebo.patch b/srcpkgs/vlc/patches/libplacebo.patch deleted file mode 100644 index 59a4403875f..00000000000 --- a/srcpkgs/vlc/patches/libplacebo.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- modules/video_output/opengl/vout_helper.c.orig 2019-10-26 20:43:34.539073815 -0400 -+++ modules/video_output/opengl/vout_helper.c 2019-10-26 20:44:35.160773193 -0400 -@@ -628,8 +628,8 @@ - .log_level = PL_LOG_INFO, - }); - if (tc->pl_ctx) { --# if PL_API_VER >= 6 -- tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0); -+# if PL_API_VER >= 20 -+ tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL); - # else - tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0); - # endif ---- modules/video_output/opengl/fragment_shaders.c.orig 2019-10-26 20:46:43.382252481 -0400 -+++ modules/video_output/opengl/fragment_shaders.c 2019-10-26 20:51:40.295679834 -0400 -@@ -616,7 +616,13 @@ - color_params.intent = var_InheritInteger(tc->gl, "rendering-intent"); - color_params.tone_mapping_algo = var_InheritInteger(tc->gl, "tone-mapping"); - color_params.tone_mapping_param = var_InheritFloat(tc->gl, "tone-mapping-param"); -+# if PL_API_VER >= 10 -+ color_params.intent = var_InheritInteger(tc->gl, "rendering-intent"); -+ color_params.tone_mapping_algo = var_InheritInteger(tc->gl, "tone-mapping"); -+ color_params.tone_mapping_param = var_InheritFloat(tc->gl, "tone-mapping-param"); -+# else - color_params.tone_mapping_desaturate = var_InheritFloat(tc->gl, "tone-mapping-desat"); -+# endif - color_params.gamut_warning = var_InheritBool(tc->gl, "tone-mapping-warn"); - - struct pl_color_space dst_space = pl_color_space_unknown; ---- modules/video_output/opengl/vout_helper.h.orig 2019-10-26 21:13:30.126142457 -0400 -+++ modules/video_output/opengl/vout_helper.h 2019-10-26 21:11:44.991922998 -0400 -@@ -171,6 +171,30 @@ - #define DEPTH_TEXT "Dither depth override (0 = framebuffer depth)" - #define DEPTH_LONGTEXT "Overrides the detected framebuffer depth. Useful to dither to lower bit depths than otherwise required." - -+#define DESAT_STRENGTH_TEXT "Desaturation strength" -+#define DESAT_STRENGTH_LONGTEXT "How strongly to desaturate bright spectral colors towards white. 0.0 disables this behavior, 1.0 enables full desaturation (hollywood-style)" -+ -+#define DESAT_EXPONENT_TEXT "Desaturation exponent" -+#define DESAT_EXPONENT_LONGTEXT "Controls the steepness of the desaturation curve. If you set this to 0.0, the curve will be flat, i.e. desaturation always enabled (hollywood-style)." -+ -+#define DESAT_BASE_TEXT "Desaturation base" -+#define DESAT_BASE_LONGTEXT "Controls the starting offset of the desaturation curve. Brightness values below this base will always be colorimetrically tone mapped (never desaturated)." -+ -+#if PL_API_VER >= 10 -+#define add_desat_params() \ -+ add_float("desat-strength", pl_color_map_default_params.desaturation_strength, \ -+ DESAT_STRENGTH_TEXT, DESAT_STRENGTH_LONGTEXT, false) \ -+ add_float("desat-exponent", pl_color_map_default_params.desaturation_exponent, \ -+ DESAT_EXPONENT_TEXT, DESAT_EXPONENT_LONGTEXT, false) \ -+ add_float("desat-base", pl_color_map_default_params.desaturation_base, \ -+ DESAT_BASE_TEXT, DESAT_BASE_LONGTEXT, false) \ -+ add_obsolete_string("tone-mapping-desat") -+#else -+#define add_desat_params() \ -+ add_float("tone-mapping-desat", pl_color_map_default_params.tone_mapping_desaturate, \ -+ TONEMAP_DESAT_TEXT, TONEMAP_DESAT_LONGTEXT, false) -+#endif -+ - #define add_glopts_placebo() \ - set_section("Colorspace conversion", NULL) \ - add_integer("rendering-intent", pl_color_map_default_params.intent, \ -@@ -184,10 +208,9 @@ - add_integer("tone-mapping", PL_TONE_MAPPING_HABLE, \ - TONEMAPPING_TEXT, TONEMAPPING_LONGTEXT, false) \ - change_integer_list(tone_values, tone_text) \ -+ add_desat_params() \ - add_float("tone-mapping-param", pl_color_map_default_params.tone_mapping_param, \ - TONEMAP_PARAM_TEXT, TONEMAP_PARAM_LONGTEXT, true) \ -- add_float("tone-mapping-desat", pl_color_map_default_params.tone_mapping_desaturate, \ -- TONEMAP_DESAT_TEXT, TONEMAP_DESAT_LONGTEXT, false) \ - add_bool("tone-mapping-warn", false, TONEMAP_WARN_TEXT, TONEMAP_WARN_LONGTEXT, false) \ - set_section("Dithering", NULL) \ - add_integer("dither-algo", -1, DITHER_TEXT, DITHER_LONGTEXT, false) \ diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 348d131b32d..07f7b6a8a81 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc -version=3.0.8 -revision=9 +version=3.0.9.2 +revision=1 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --enable-live555 --disable-fluidsynth --enable-dvdread @@ -17,7 +17,7 @@ license="GPL-2.0-only, LGPL-2.1-only" homepage="https://www.videolan.org/vlc/" changelog="https://www.videolan.org/developers/vlc-branch/NEWS" distfiles="https://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz" -checksum=e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6 +checksum=a9bdad293d81cd48516abad8d490d8ab4012964ae541ff19e00021e071e47601 lib32disabled=yes