summaryrefslogtreecommitdiff
path: root/pkgconfig
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2017-12-11 12:59:09 +0000
committerTim-Philipp Müller <tim@centricular.com>2017-12-19 12:02:31 +0000
commit769a21d0bb310906b880c07da0e1e2376e11c187 (patch)
tree02b93bbe659389c940abd69b3a214cfa05f6c501 /pkgconfig
parent43631c63ea76c524f96488dbdf4f4e20fa764626 (diff)
gl: remove GStreamer OpenGL integration library and move to -base
https://bugzilla.gnome.org/show_bug.cgi?id=754094
Diffstat (limited to 'pkgconfig')
-rw-r--r--pkgconfig/Makefile.am6
-rw-r--r--pkgconfig/gstreamer-plugins-bad-uninstalled.pc.in2
-rw-r--r--pkgconfig/meson.build9
3 files changed, 1 insertions, 16 deletions
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 8fecfa7b5..b5f1d7bb1 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -20,11 +20,6 @@ pcverfiles_uninstalled = \
gstreamer-bad-video-@GST_API_VERSION@-uninstalled.pc \
gstreamer-bad-allocators-@GST_API_VERSION@-uninstalled.pc
-if HAVE_GST_GL
-pcverfiles += gstreamer-gl-@GST_API_VERSION@.pc
-pcverfiles_uninstalled += gstreamer-gl-@GST_API_VERSION@-uninstalled.pc
-endif
-
all-local: $(pcverfiles) $(pcverfiles_uninstalled)
cp_verbose = $(cp_verbose_$(V))
@@ -57,7 +52,6 @@ CLEANFILES = $(pcverfiles) $(pcverfiles_uninstalled)
pcinfiles = \
gstreamer-plugins-bad.pc.in gstreamer-plugins-bad-uninstalled.pc.in \
gstreamer-codecparsers.pc.in gstreamer-codecparsers-uninstalled.pc.in \
- gstreamer-gl.pc.in gstreamer-gl-uninstalled.pc.in \
gstreamer-insertbin.pc.in gstreamer-insertbin-uninstalled.pc.in \
gstreamer-mpegts.pc.in gstreamer-mpegts-uninstalled.pc.in \
gstreamer-player.pc.in gstreamer-player-uninstalled.pc.in \
diff --git a/pkgconfig/gstreamer-plugins-bad-uninstalled.pc.in b/pkgconfig/gstreamer-plugins-bad-uninstalled.pc.in
index 84f2441ea..efd014e97 100644
--- a/pkgconfig/gstreamer-plugins-bad-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-plugins-bad-uninstalled.pc.in
@@ -10,5 +10,5 @@ Name: GStreamer Bad Plugin libraries, Uninstalled
Description: Streaming media framework, bad plugins libraries, uninstalled
Version: @VERSION@
Requires: gstreamer-@GST_API_VERSION@
-Libs: -L@audiolibdir@ -L@basecamerabinsrclibdir@ -L@codecparserslibdir@ -L@gllibdir@ -L@insertbinlibdir@ -L@photographylibdir@ -L@mpegtslibdir@ -L@playerlibdir@ -L@videolibdir@ -L@waylandlibdir@
+Libs: -L@audiolibdir@ -L@basecamerabinsrclibdir@ -L@codecparserslibdir@ -L@insertbinlibdir@ -L@photographylibdir@ -L@mpegtslibdir@ -L@playerlibdir@ -L@videolibdir@ -L@waylandlibdir@
Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
index 5f90e0432..01317cb2e 100644
--- a/pkgconfig/meson.build
+++ b/pkgconfig/meson.build
@@ -31,15 +31,6 @@ pkg_libs = [
'plugins-bad',
]
-# XXX: requires the meson.build to be parsed/executed after gst-libs/gl/meson.build
-if build_gstgl
- pkgconf.set('gllibdir', join_paths(meson.build_root(), gstgl.outdir()))
- pkg_libs += 'gl'
- pkgconf.set('GL_APIS', ' '.join(enabled_gl_apis))
- pkgconf.set('GL_WINDOWS', ' '.join(enabled_gl_winsys))
- pkgconf.set('GL_PLATFORMS', ' '.join(enabled_gl_platforms))
-endif
-
#if use_wayland
# pkgconf.set('waylandlibdir', join_paths(meson.build_root(), gstwayland.outdir()))
# pkg_libs += 'wayland'