Date: Sun, 12 May 2019 01:42:53 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501355 - in head: graphics/libplacebo multimedia/vlc multimedia/vlc/files Message-ID: <201905120142.x4C1grpF042206@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun May 12 01:42:53 2019 New Revision: 501355 URL: https://svnweb.freebsd.org/changeset/ports/501355 Log: graphics/libplacebo: update to 1.18.0 Changes: https://code.videolan.org/videolan/libplacebo/tags/v1.18.0 Reported by: portscout Added: head/multimedia/vlc/files/patch-libplacebo-1.18 (contents, props changed) Modified: head/graphics/libplacebo/Makefile (contents, props changed) head/graphics/libplacebo/distinfo (contents, props changed) head/graphics/libplacebo/pkg-plist (contents, props changed) head/multimedia/vlc/Makefile (contents, props changed) Modified: head/graphics/libplacebo/Makefile ============================================================================== --- head/graphics/libplacebo/Makefile Sun May 12 01:14:14 2019 (r501354) +++ head/graphics/libplacebo/Makefile Sun May 12 01:42:53 2019 (r501355) @@ -2,12 +2,8 @@ PORTNAME= libplacebo DISTVERSIONPREFIX= v -DISTVERSION= 1.7.0 -PORTREVISION= 1 +DISTVERSION= 1.18.0 CATEGORIES= graphics - -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 95814b653b71.patch:-p1 # don't check shaderc twice MAINTAINER= jbeich@FreeBSD.org COMMENT= Reusable library for GPU-accelerated video/image rendering Modified: head/graphics/libplacebo/distinfo ============================================================================== --- head/graphics/libplacebo/distinfo Sun May 12 01:14:14 2019 (r501354) +++ head/graphics/libplacebo/distinfo Sun May 12 01:42:53 2019 (r501355) @@ -1,5 +1,3 @@ -TIMESTAMP = 1544969285 -SHA256 (haasn-libplacebo-v1.7.0_GH0.tar.gz) = 5ee618bee614aeae9f8bb526329824468f93c740e8fd37fd46d58114fd7977eb -SIZE (haasn-libplacebo-v1.7.0_GH0.tar.gz) = 312130 -SHA256 (95814b653b71.patch) = 0a0efeb485cd04e514aae612714e962ebb5e18662a4d89f61e2895dc8a7d959a -SIZE (95814b653b71.patch) = 643 +TIMESTAMP = 1550167893 +SHA256 (haasn-libplacebo-v1.18.0_GH0.tar.gz) = e47983483e4c8beccb0b77f6301b7831837885bd5566130d81ad37107845509a +SIZE (haasn-libplacebo-v1.18.0_GH0.tar.gz) = 322953 Modified: head/graphics/libplacebo/pkg-plist ============================================================================== --- head/graphics/libplacebo/pkg-plist Sun May 12 01:14:14 2019 (r501354) +++ head/graphics/libplacebo/pkg-plist Sun May 12 01:42:53 2019 (r501355) @@ -4,6 +4,7 @@ include/libplacebo/config.h include/libplacebo/context.h include/libplacebo/dispatch.h include/libplacebo/dither.h +include/libplacebo/dummy.h include/libplacebo/filters.h include/libplacebo/gpu.h include/libplacebo/renderer.h @@ -15,5 +16,5 @@ include/libplacebo/swapchain.h include/libplacebo/utils/upload.h include/libplacebo/vulkan.h lib/libplacebo.so -lib/libplacebo.so.7 +lib/libplacebo.so.18 libdata/pkgconfig/libplacebo.pc Modified: head/multimedia/vlc/Makefile ============================================================================== --- head/multimedia/vlc/Makefile Sun May 12 01:14:14 2019 (r501354) +++ head/multimedia/vlc/Makefile Sun May 12 01:42:53 2019 (r501355) @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 3.0.6 -PORTREVISION= 12 +PORTREVISION= 13 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ Added: head/multimedia/vlc/files/patch-libplacebo-1.18 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vlc/files/patch-libplacebo-1.18 Sun May 12 01:42:53 2019 (r501355) @@ -0,0 +1,98 @@ +https://mailman.videolan.org/pipermail/vlc-devel/2019-May/124293.html + +--- modules/video_output/opengl/fragment_shaders.c.orig 2018-12-16 20:40:54 UTC ++++ modules/video_output/opengl/fragment_shaders.c +@@ -616,7 +616,13 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_ + 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.desaturation_strength = var_InheritFloat(tc->gl, "desat-strength"); ++ color_params.desaturation_exponent = var_InheritFloat(tc->gl, "desat-exponent"); ++ color_params.desaturation_base = var_InheritFloat(tc->gl, "desat-base"); ++# 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.c.orig 2018-10-10 14:20:20 UTC ++++ modules/video_output/opengl/vout_helper.c +@@ -628,7 +628,9 @@ opengl_init_program(vout_display_opengl_t *vgl, struct + .log_level = PL_LOG_INFO, + }); + if (tc->pl_ctx) { +-# if PL_API_VER >= 6 ++# if PL_API_VER >= 20 ++ tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL); ++# elif PL_API_VER >= 6 + tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0); + # else + tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0, 0); +--- modules/video_output/opengl/vout_helper.h.orig 2018-02-19 15:53:40 UTC ++++ modules/video_output/opengl/vout_helper.h +@@ -151,6 +151,30 @@ static const char * const tone_text[] = { + #define TONEMAP_WARN_TEXT "Highlight clipped pixels" + #define TONEMAP_WARN_LONGTEXT "Debugging tool to indicate which pixels were clipped as part of the tone mapping process." + ++#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)." ++ ++#define MAX_BOOST_TEXT "Maximum brightness boost" ++#define MAX_BOOST_LONGTEXT "Maximum allowed brightness boost to compensate for dark scenes. A value of 1.0 means no brightness boost is allowed." ++ ++#define PEAK_PERIOD_TEXT "HDR peak detection period" ++#define PEAK_PERIOD_LONGTEXT "This option enables peak detection with the specified smoothing period. A value of 0.0 disables peak detection. Higher values result in a larger smoothing period which means the detected values will be stable over a longer number of frames, at the cost of responding more slowly to changes in scene brightness" ++ ++#define SCENE_THRESHOLD_LOW_TEXT "Scene change lower threshold" ++#define SCENE_THRESHOLD_LOW_LONGTEXT "When using HDR peak detection, this sets the lower boundary of a brightness change indicating a scene change. Brightness changes between frames that exceed this threshold will begin to be mixed into the detected peak more strongly, bypassing the peak smoothing. Setting this to a negative number disables this logic." ++ ++#define SCENE_THRESHOLD_HIGH_TEXT "Scene change upper threshold" ++#define SCENE_THRESHOLD_HIGH_LONGTEXT "This sets the upper boundary of a brightness change indicating a scene change. Brightness changes that exceed this value will instantly replace the detected peak, bypassing all smoothing. Setting this to a negative number disables this logic." ++ ++#define DELAYED_PEAK_TEXT "Allow delaying peak detection by up to one frame" ++#define DELAYED_PEAK_LONGTEXT "In some cases, peak detection may be more convenient to compute if the results are delayed by a frame. When this option is disabled, libplacebo will use an indirect buffer simply to force peak detection results to be up-to-date. Enabling it allows skipping this indirection in order to improve performance at the cost of some potentially noticeable brightness flickering immediately after a scene change." ++ + #define DITHER_TEXT "Dithering algorithm" + #define DITHER_LONGTEXT "The algorithm to use when dithering to a lower bit depth (degrades performance on some platforms)." + +@@ -171,6 +195,21 @@ static const char * const dither_text[] = { + #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." + ++ ++#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) ++#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 +223,9 @@ static const char * const dither_text[] = { + 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) \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905120142.x4C1grpF042206>