meson: gl: define HAVE_PNG etc. in config.h instead of c_args

So that the tests have access to them as well (gl-launch-lines.c)

diff --git a/ext/gl/meson.build b/ext/gl/meson.build
index f78a346..684a6cc 100644 (file)
--- a/ext/gl/meson.build
+++ b/ext/gl/meson.build
@@ -48,7 +48,6 @@ opengl_sources = [
 
 if build_gstgl and gstgl_dep.found()
   optional_deps = []
-  opengl_defines = []
 
   if gl_dep.found() # have desktop GL
     # These have to stay in -bad until we can move GstVideoAggregator to -base
@@ -61,7 +60,7 @@ if build_gstgl and gstgl_dep.found()
   graphene_dep = dependency('graphene-1.0', version : '>=1.4.0', required : false)
   if graphene_dep.found()
     optional_deps += graphene_dep
-    opengl_defines += '-DHAVE_GRAPHENE=1'
+    core_conf.set('HAVE_GRAPHENE', true)
     opengl_sources += [
       'gstgltransformation.c',
       'gstglvideoflip.c',
@@ -76,13 +75,13 @@ if build_gstgl and gstgl_dep.found()
 
   if png_dep.found()
     optional_deps += png_dep
-    opengl_defines += '-DHAVE_PNG=1'
+    core_conf.set('HAVE_PNG', true)
     opengl_sources += [
       'gstgldifferencematte.c',
     ]
     if jpeg_dep.found()
       optional_deps += jpeg_dep
-      opengl_defines += '-DHAVE_JPEG=1'
+      core_conf.set('HAVE_JPEG', true)
       opengl_sources += [
         'gstgloverlay.c',
       ]
@@ -110,7 +109,7 @@ if build_gstgl and gstgl_dep.found()
 
   gstopengl = library('gstopengl',
     opengl_sources,
-    c_args : gst_plugins_base_args + opengl_defines,
+    c_args : gst_plugins_base_args,
     link_args : noseh_link_args,
     include_directories : [configinc],
     dependencies : [gstgl_dep, video_dep,

diff --git a/tests/check/meson.build b/tests/check/meson.build
index 094d167..94d6e7b 100644 (file)
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -54,7 +54,6 @@ base_tests = [
   [ 'elements/vorbistag.c', not vorbisenc_dep.found(), [ vorbis_dep, vorbisenc_dep ] ],
   [ 'generic/clock-selection.c' ],
   [ 'generic/states.c', false, [ gmodule_dep ] ],
-  [ 'pipelines/gl-launch-lines.c', not build_gstgl ],
   [ 'pipelines/simple-launch-lines.c' ],
   [ 'pipelines/basetime.c' ],
   [ 'pipelines/capsfilter-renegotiation.c' ],
@@ -80,6 +79,7 @@ if build_gstgl
     [ 'libs/gstglslstage.c', not build_gstgl, [gstgl_dep]],
     [ 'libs/gstglupload.c', not build_gstgl, [gstgl_dep]],
     [ 'elements/glimagesink.c', not build_gstgl, [gstgl_dep]],
+    [ 'pipelines/gl-launch-lines.c', not build_gstgl ],
   ]
 endif