[SCM] vlc/master: Enable libplacebo

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1f380f94fdb2180f08c3ecef03c65957a38c1365
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri Jan 5 09:48:43 2018 +0100

    Enable libplacebo

diff --git a/debian/control b/debian/control
index 83ab5c3..8cfd4f5 100644
--- a/debian/control
+++ b/debian/control
@@ -71,6 +71,7 @@ Build-Depends: autopoint,
                libomxil-bellagio-dev [linux-any],
                libopenmpt-modplug-dev | libmodplug-dev (>= 1:0.8.8.1),
                libopus-dev (>= 1.0.3),
+               libplacebo-dev (>= 0.2) [linux-any],
                libpng-dev,
                libpostproc-dev (>= 7:3.0),
                libprotobuf-dev (>= 2.5.0),
diff --git a/debian/patches/0001-opengl-update-libplacebo-to-v0.2.0.patch b/debian/patches/0001-opengl-update-libplacebo-to-v0.2.0.patch
new file mode 100644
index 0000000..e251758
--- /dev/null
+++ b/debian/patches/0001-opengl-update-libplacebo-to-v0.2.0.patch
@@ -0,0 +1,55 @@
+From: Niklas Haas <vlc at haasn.xyz>
+Date: Thu, 28 Dec 2017 04:47:53 +0100
+Subject: opengl: update libplacebo to v0.2.0
+
+Some calls got an extra parameter which we don't care about.
+
+Also bump up the minimum libplacebo version to v0.2.0. Note: This
+commit doesn't update the contrib/ entry for libplacebo.
+
+Signed-off-by: Thomas Guillem <thomas at gllm.fr>
+---
+ configure.ac                                   | 2 +-
+ modules/video_output/opengl/fragment_shaders.c | 2 +-
+ modules/video_output/opengl/vout_helper.c      | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ecfac46..1d9a45b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4134,7 +4134,7 @@ AC_ARG_ENABLE(libplacebo,
+       [disable libplacebo support (default auto)])])
+ 
+ AS_IF([test "$enable_libplacebo" != "no"], [
+-  PKG_CHECK_MODULES([LIBPLACEBO], [libplacebo >= 0.1], [
++  PKG_CHECK_MODULES([LIBPLACEBO], [libplacebo >= 0.2], [
+     AC_DEFINE([HAVE_LIBPLACEBO], [1], [Define to 1 if libplacebo is enabled.])
+   ], [
+     AS_IF([test -n "${enable_libplacebo}"], [
+diff --git a/modules/video_output/opengl/fragment_shaders.c b/modules/video_output/opengl/fragment_shaders.c
+index 3cc9222..cbd0a52 100644
+--- a/modules/video_output/opengl/fragment_shaders.c
++++ b/modules/video_output/opengl/fragment_shaders.c
+@@ -607,7 +607,7 @@ opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target,
+         struct pl_shader *sh = tc->pl_sh;
+         pl_shader_color_map(sh, &pl_color_map_default_params,
+                 pl_color_space_from_video_format(&tc->fmt),
+-                pl_color_space_unknown, false);
++                pl_color_space_unknown, NULL, false);
+ 
+         const struct pl_shader_res *res = tc->pl_sh_res = pl_shader_finalize(sh);
+ 
+diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
+index 87e53a3..ed99996 100644
+--- a/modules/video_output/opengl/vout_helper.c
++++ b/modules/video_output/opengl/vout_helper.c
+@@ -627,7 +627,7 @@ opengl_init_program(vout_display_opengl_t *vgl, struct prgm *prgm,
+             .log_level = PL_LOG_INFO,
+         });
+         if (tc->pl_ctx)
+-            tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0);
++            tc->pl_sh = pl_shader_alloc(tc->pl_ctx, NULL, 0, 0);
+     }
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..26dd522
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-opengl-update-libplacebo-to-v0.2.0.patch
diff --git a/debian/rules b/debian/rules
index 9ff40f3..545b5e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,7 +94,6 @@ confflags += \
 # fluidlite: fluidsynth is enabled
 # goom: not in Debian
 # gst-decode: not needed when having libavcodec
-# libplacebo: not in Debian
 # libtar: security issue (#737534)
 # macosx*: MacOX only
 # mfx: currently not supported on Linux
@@ -117,7 +116,6 @@ confflags += \
 	--disable-fluidlite \
 	--disable-goom \
 	--disable-gst-decode \
-	--disable-libplacebo \
 	--disable-libtar \
 	--disable-macosx \
 	--disable-macosx-avfoundation \
@@ -143,6 +141,7 @@ confflags += \
 	--enable-alsa \
 	--enable-dc1394 \
 	--enable-dv1394 \
+	--enable-libplacebo \
 	--enable-linsys \
 	--enable-nfs \
 	--enable-omxil \
@@ -155,6 +154,7 @@ confflags += \
 	--disable-alsa \
 	--disable-dc1394 \
 	--disable-dv1394 \
+	--disable-libplacebo \
 	--disable-linsys \
 	--disable-nfs \
 	--disable-omxil \

-- 
VLC media player packaging