diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2020-07-23 19:48:55 +1000 |
---|---|---|
committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2020-08-06 04:09:09 +0000 |
commit | dd5f7f1bf97eaec3d967b3fe670e3e600088904a (patch) | |
tree | f9483685164ef301e6cbacad5805b8c2e53d828f /tests/examples | |
parent | 9339f0198c2d6850ea06b8ad2dd38625723e5ecf (diff) |
gl: move each gl platform specific API to its own gir
With contributions from:
Thibault Saunier <tsaunier@igalia.com>
Matthew Waters <matthew@centricular.com>
Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/651
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/661>
Diffstat (limited to 'tests/examples')
-rw-r--r-- | tests/examples/gl/generic/cube/meson.build | 2 | ||||
-rw-r--r-- | tests/examples/gl/generic/cubeyuv/meson.build | 2 | ||||
-rw-r--r-- | tests/examples/gl/generic/doublecube/meson.build | 2 | ||||
-rw-r--r-- | tests/examples/gl/generic/recordgraphic/meson.build | 2 | ||||
-rw-r--r-- | tests/examples/gl/qt/meson.build | 2 | ||||
-rw-r--r-- | tests/examples/gl/qt/mousevideooverlay/meson.build | 2 | ||||
-rw-r--r-- | tests/examples/gl/qt/qglwidgetvideooverlay/meson.build | 2 | ||||
-rw-r--r-- | tests/examples/gl/qt/qglwtextureshare/meson.build | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/tests/examples/gl/generic/cube/meson.build b/tests/examples/gl/generic/cube/meson.build index edb62460b..5534ec702 100644 --- a/tests/examples/gl/generic/cube/meson.build +++ b/tests/examples/gl/generic/cube/meson.build @@ -1,5 +1,5 @@ if have_cxx executable('cube', 'main.cpp', - dependencies : [gstgl_dep, gl_dep], + dependencies : [gstgl_dep, gstglproto_dep], install: false) endif diff --git a/tests/examples/gl/generic/cubeyuv/meson.build b/tests/examples/gl/generic/cubeyuv/meson.build index 38a43c9bf..dcb93d4be 100644 --- a/tests/examples/gl/generic/cubeyuv/meson.build +++ b/tests/examples/gl/generic/cubeyuv/meson.build @@ -1,5 +1,5 @@ if have_cxx executable('cubeyuv', 'main.cpp', - dependencies : [gstgl_dep, gl_dep], + dependencies : [gstgl_dep, gstglproto_dep], install: false) endif diff --git a/tests/examples/gl/generic/doublecube/meson.build b/tests/examples/gl/generic/doublecube/meson.build index 7c523e2dc..f99399171 100644 --- a/tests/examples/gl/generic/doublecube/meson.build +++ b/tests/examples/gl/generic/doublecube/meson.build @@ -1,5 +1,5 @@ if have_cxx executable('doublecube', 'main.cpp', - dependencies : [gstgl_dep, gl_dep], + dependencies : [gstgl_dep, gstglproto_dep], install: false) endif diff --git a/tests/examples/gl/generic/recordgraphic/meson.build b/tests/examples/gl/generic/recordgraphic/meson.build index 938aa37d9..0634933de 100644 --- a/tests/examples/gl/generic/recordgraphic/meson.build +++ b/tests/examples/gl/generic/recordgraphic/meson.build @@ -1,5 +1,5 @@ if have_cxx executable('recordgraphic', 'main.cpp', - dependencies : [gstgl_dep, gl_dep], + dependencies : [gstgl_dep, gstglproto_dep], install: false) endif diff --git a/tests/examples/gl/qt/meson.build b/tests/examples/gl/qt/meson.build index 523f8a10d..ed0a0b0bb 100644 --- a/tests/examples/gl/qt/meson.build +++ b/tests/examples/gl/qt/meson.build @@ -2,7 +2,7 @@ qt5_mod = import('qt5') qt5gui_dep = dependency('qt5', modules : ['Core', 'Gui', 'Widgets'], required : false) qt5opengl_dep = dependency('qt5', modules : ['OpenGL'], required : false) -# FIXME: other platforms +#FIXME; other platforms libgl = cc.find_library ('GL', required : false) qt_cxx_warn_less = cxx.get_supported_arguments(['-Wno-aggregate-return']) diff --git a/tests/examples/gl/qt/mousevideooverlay/meson.build b/tests/examples/gl/qt/mousevideooverlay/meson.build index a4f6071ef..ec09fb89e 100644 --- a/tests/examples/gl/qt/mousevideooverlay/meson.build +++ b/tests/examples/gl/qt/mousevideooverlay/meson.build @@ -15,5 +15,5 @@ moc_files = qt5_mod.preprocess(moc_headers : moc_headers) executable('mousevideoverlay', sources, moc_files, cpp_args : [gst_plugins_base_args] + qt_cxx_warn_less, include_directories: [configinc, libsinc], - dependencies : [qt5core_dep, qt5gui_dep, gst_dep, video_dep, gstgl_dep, libgl], + dependencies : [qt5core_dep, qt5gui_dep, gst_dep, video_dep, gstgl_dep, gstglproto_dep], install: false) diff --git a/tests/examples/gl/qt/qglwidgetvideooverlay/meson.build b/tests/examples/gl/qt/qglwidgetvideooverlay/meson.build index 176c4856a..f9a885fc9 100644 --- a/tests/examples/gl/qt/qglwidgetvideooverlay/meson.build +++ b/tests/examples/gl/qt/qglwidgetvideooverlay/meson.build @@ -15,5 +15,5 @@ moc_files = qt5_mod.preprocess(moc_headers : moc_headers) executable('qglwidgetvideoverlay', sources, moc_files, cpp_args : [gst_plugins_base_args] + qt_cxx_warn_less, include_directories: [configinc, libsinc], - dependencies : [qt5core_dep, qt5gui_dep, qt5opengl_dep, gst_dep, video_dep, gstgl_dep, libgl], + dependencies : [qt5core_dep, qt5gui_dep, qt5opengl_dep, gst_dep, video_dep, gstgl_dep, gstglproto_dep], install: false) diff --git a/tests/examples/gl/qt/qglwtextureshare/meson.build b/tests/examples/gl/qt/qglwtextureshare/meson.build index 781bf3fe5..19c830a3f 100644 --- a/tests/examples/gl/qt/qglwtextureshare/meson.build +++ b/tests/examples/gl/qt/qglwtextureshare/meson.build @@ -25,5 +25,5 @@ moc_files = qt5_mod.preprocess(moc_headers : moc_headers) executable('qglwtextureshare', sources, moc_files, cpp_args : [gst_plugins_base_args] + qt_cxx_warn_less, include_directories: [configinc, libsinc], - dependencies : [qt5core_dep, qt5gui_dep, qt5opengl_dep, qtwinsys_deps, gst_dep, video_dep, gstgl_dep, libgl], + dependencies : [qt5core_dep, qt5gui_dep, qt5opengl_dep, qtwinsys_deps, gst_dep, video_dep, gstgl_dep, gstglproto_dep], install: false) |