From 3b5c2049bba360c36c6021bd93784e3b3fac3b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 25 Mar 2018 12:53:06 +0300 Subject: [PATCH] gl: Rename gstglutils.h functions to prevent symbol conflicts with static linking The gl plugin in -base has the same function. --- ext/gl/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ext/gl/Makefile.am b/ext/gl/Makefile.am index b501a51108..63a74f037a 100644 --- a/ext/gl/Makefile.am +++ b/ext/gl/Makefile.am @@ -35,7 +35,11 @@ libgstopenglmixers_la_CFLAGS = \ $(GST_BASE_CFLAGS) \ $(GST_CONTROLLER_CFLAGS) \ $(GST_CFLAGS) \ - $(X11_CFLAGS) + $(X11_CFLAGS) \ + -Dgst_gl_context_gen_shader=gst_gl_bad_context_gen_shader \ + -Dgst_gl_multiply_matrix4=Dgst_gl_bad_multiply_matrix4 \ + -Dgst_gl_get_affine_transformation_meta_as_ndc_ext=Dgst_gl_bad_get_affine_transformation_meta_as_ndc_ext \ + -Dgst_gl_set_affine_transformation_meta_from_ndc_ext=Dgst_gl_bad_set_affine_transformation_meta_from_ndc_ext libgstopenglmixers_la_LIBADD = \ $(top_builddir)/gst-libs/gst/video/libgstbadvideo-@GST_API_VERSION@.la \