From: Niklas Haas <git@haasn.xyz>
Date: Fri, 28 Sep 2018 17:18:44 +0000 (+0200)
Subject: vout_opengl: update for libplacebo 0.6 API
X-Git-Tag: archive/raspbian/3.0.11.1-2+rpi1~1^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8d9c7dcc1b9ca431bd1a550768707ef8919c7d93;p=vlc.git

vout_opengl: update for libplacebo 0.6 API

This removed a superfluous field from the pl_shader_alloc signature.

Signed-off-by: Thomas Guillem <thomas@gllm.fr>
(cherry picked from commit b90995ef08c2d72a0222c527e1ef3d586d00bccd)
Signed-off-by: Thomas Guillem <thomas@gllm.fr>

Gbp-Pq: Name 0003-vout_opengl-update-for-libplacebo-0.6-API.patch
---

diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
index 4ff70adc..919560e6 100644
--- a/modules/video_output/opengl/vout_helper.c
+++ b/modules/video_output/opengl/vout_helper.c
@@ -627,8 +627,13 @@ opengl_init_program(vout_display_opengl_t *vgl, struct prgm *prgm,
             .log_priv  = tc,
             .log_level = PL_LOG_INFO,
         });
-        if (tc->pl_ctx)
+        if (tc->pl_ctx) {
+#   if 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);
+#   endif
+        }
     }
 #endif