Merge branch 'mpv' of git://github.com/pbui/void-packages into pbui-mpv

2019-10-27 11:38:48 +01:00 · 2019-10-27 11:38:48 +01:00 · ecb6253cc6
commit ecb6253cc6
parent 5719fa922f 14f63cc7a3
4 changed files with 88 additions and 14 deletions
--- a/srcpkgs/libplacebo/template
+++ b/srcpkgs/libplacebo/template
@ -1,6 +1,6 @@
 # Template file for 'libplacebo'
 pkgname=libplacebo
-version=1.7.0
+version=1.21.0
 revision=1
 build_style=meson
 configure_args="-Dvulkan=enabled -Dglslang=enabled -Dshaderc=enabled"
@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/haasn/libplacebo"
 distfiles="https://github.com/haasn/libplacebo/archive/v${version}.tar.gz"
-checksum=5ee618bee614aeae9f8bb526329824468f93c740e8fd37fd46d58114fd7977eb
+checksum=09d78911a2c13c38b8913d29cf4d78c424d00aa998a84a8011e5db14477c72f8

 libplacebo-devel_package() {
 	depends="libplacebo-${version}_${revision} vulkan-loader lcms2-devel"
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@ -1,29 +1,29 @@
 # Template file for 'mpv'
 pkgname=mpv
-version=0.29.1
-revision=7
+version=0.30.0
+revision=1
 build_style=waf
 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
- --enable-dvdread --enable-dvdnav --enable-cdda --enable-libmpv-shared
+ --enable-dvdnav --enable-dvdnav --enable-cdda --enable-libmpv-shared
 --enable-dvbin --enable-libarchive $(vopt_enable alsa) $(vopt_enable caca)
 $(vopt_enable jack) $(vopt_enable lua) $(vopt_enable oss oss-audio)
 $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2)
- $(vopt_enable smb libsmbclient) $(vopt_enable sndio) $(vopt_enable v4l2 tv)
+ $(vopt_enable smb libsmbclient) $(vopt_enable sndio)
 $(vopt_enable vapoursynth) $(vopt_enable vdpau) $(vopt_enable wayland)
 $(vopt_enable x11) $(vopt_enable vulkan) $(vopt_enable vulkan shaderc)"
 hostmakedepends="pkg-config python-docutils perl $(vopt_if wayland wayland-devel)"
 makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel lcms2-devel libXv-devel
 libass-devel libbluray-devel libcdio-paranoia-devel libdvdnav-devel
- libdvdread-devel libguess-devel libuuid-devel libva-glx-devel rubberband-devel
+ libdvdnav-devel libguess-devel libuuid-devel libva-glx-devel rubberband-devel
 libarchive-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if caca libcaca-devel)
 $(vopt_if jack jack-devel) $(vopt_if lua lua52-devel)
 $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sdl2 SDL2-devel)
 $(vopt_if smb samba-devel) $(vopt_if sndio sndio-devel)
- $(vopt_if v4l2 v4l-utils-devel) $(vopt_if vapoursynth vapoursynth-devel)
+ $(vopt_if vapoursynth vapoursynth-devel)
 $(vopt_if vdpau libvdpau-devel) $(vopt_if wayland "wayland-devel
 wayland-protocols libxkbcommon-devel")
 $(vopt_if x11 "libXScrnSaver-devel libXinerama-devel libXrandr-devel")
- $(vopt_if vulkan 'Vulkan-Headers vulkan-loader shaderc')"
+ $(vopt_if vulkan 'Vulkan-Headers vulkan-loader shaderc libplacebo-devel')"
 depends="desktop-file-utils hicolor-icon-theme $(vopt_if vapoursynth vapoursynth-mvtools)"
 short_desc="Video player based on MPlayer/mplayer2"
 maintainer="Orphaned <orphan@voidlinux.org>"
@ -31,17 +31,17 @@ license="GPL-2.0-or-later"
 homepage="https://mpv.io"
 changelog="https://github.com/mpv-player/mpv/releases"
 distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz"
-checksum=f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623
+checksum=33a1bcb7e74ff17f070e754c15c52228cf44f2cefbfd8f34886ae81df214ca35

 build_options="alsa caca jack lua oss pulseaudio sdl2 smb sndio vapoursynth
- vdpau v4l2 wayland x11 vulkan"
-build_options_default="alsa jack lua pulseaudio sndio vdpau wayland x11 v4l2 vulkan"
+ vdpau wayland x11 vulkan"
+build_options_default="alsa jack lua pulseaudio sndio vdpau wayland x11 vulkan"
 desc_option_caca="Enable support for libcaca video output"
 desc_option_oss="Enable support for OSS audio output"
 vopt_conflict sdl2 wayland

 if [ -z "$CROSS_BUILD" ]; then
-	configure_args+=" --enable-zsh-comp"
+	configure_args+=" --zshdir=/usr/share/zsh/site-functions"
 fi

 pre_configure() {
--- a/srcpkgs/vlc/patches/libplacebo.patch
+++ b/srcpkgs/vlc/patches/libplacebo.patch
@ -0,0 +1,74 @@
+--- 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) \
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.8
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
 --enable-live555 --disable-fluidsynth --enable-dvdread