[cogl/rstrode/wip/prepare-for-mutter-merge: 12/12] build: drop gstreamer support
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/rstrode/wip/prepare-for-mutter-merge: 12/12] build: drop gstreamer support
- Date: Thu, 10 Mar 2016 21:49:43 +0000 (UTC)
commit 3e72da3eb1260166a3d1709f6dd71db8b3a97625
Author: Ray Strode <rstrode redhat com>
Date: Tue Jan 12 17:03:16 2016 -0500
build: drop gstreamer support
Makefile.am | 4 -
cogl-gst/Makefile.am | 107 --
cogl-gst/cogl-gst-1.0.pc.in | 13 -
cogl-gst/cogl-gst-2.0-experimental.pc.in | 13 -
cogl-gst/cogl-gst-plugin.c | 57 -
cogl-gst/cogl-gst-video-sink.c | 1743 ------------------------------
cogl-gst/cogl-gst-video-sink.h | 533 ---------
cogl-gst/cogl-gst.h | 35 -
cogl-gst/cogl-gst.pc.in | 13 -
configure.ac | 50 -
10 files changed, 0 insertions(+), 2568 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index dfe2234..9080fbe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,10 +14,6 @@ if BUILD_COGL_GLES2
SUBDIRS += cogl-gles2
endif
-if BUILD_COGL_GST
-SUBDIRS += cogl-gst
-endif
-
SUBDIRS += po build
ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS}
diff --git a/configure.ac b/configure.ac
index 83460ff..4f3cc22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -444,43 +444,6 @@ AS_IF([test "x$enable_cogl_pango" = "xyes"],
)
dnl ============================================================
-dnl Should cogl-gst be built?
-dnl ============================================================
-
-AS_IF([test "x$enable_glib" != "xyes"],
- [
- AS_IF([test "x$enable_cogl_gst" = "xyes"],
- AC_MSG_ERROR([--enable-cogl-gst conflicts with --disable-glib]))
- enable_cogl_gst=no
- ]
-)
-
-AC_ARG_ENABLE(
- [cogl-gst],
- [AC_HELP_STRING([--enable-cogl-gst=@<:@no/yes@:>@], [Enable gstreamer support @<:@default=no@:>@])],
- [],
- enable_cogl_gst=no
-)
-AS_IF([test "x$enable_cogl_gst" = "xyes"],
- [
- COGL_GST_PKG_REQUIRES="$COGL_GST_PKG_REQUIRES gstreamer-1.0 gstreamer-fft-1.0 \
- gstreamer-audio-1.0 gstreamer-base-1.0 \
- gstreamer-video-1.0 gstreamer-plugins-base-1.0 \
- gstreamer-tag-1.0 gstreamer-controller-1.0"
-
- GST_MAJORMINOR=1.0
-
- dnl define location of gstreamer plugin directory
- plugindir="\$(libdir)/gstreamer-$GST_MAJORMINOR"
- AC_SUBST(plugindir)
-
- dnl For the gtk doc generation
- GSTREAMER_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-1.0`"
- AC_SUBST(GSTREAMER_PREFIX)
- ]
-)
-
-dnl ============================================================
dnl Should cogl-path be built?
dnl ============================================================
@@ -970,15 +933,6 @@ AM_CONDITIONAL([BUILD_COGL_PANGO], [test "x$enable_cogl_pango" = "xyes"])
AM_CONDITIONAL([BUILD_COGL_PATH], [test "x$enable_cogl_path" = "xyes"])
-AC_SUBST(COGL_GST_PKG_REQUIRES)
-
-AS_IF([test "x$enable_cogl_gst" = "xyes"],
- [PKG_CHECK_MODULES(COGL_GST_DEP, [$COGL_GST_PKG_REQUIRES])]
-)
-AM_CONDITIONAL([BUILD_COGL_GST], [test "x$enable_cogl_gst" = "xyes"])
-
-
-
dnl ================================================================
dnl Misc program dependencies.
dnl ================================================================
@@ -1134,9 +1088,6 @@ cogl-pango/cogl-pango.rc
cogl-path/Makefile
cogl-path/cogl-path-1.0.pc
cogl-path/cogl-path-2.0-experimental.pc
-cogl-gst/Makefile
-cogl-gst/cogl-gst-1.0.pc
-cogl-gst/cogl-gst-2.0-experimental.pc
cogl-gles2/Makefile
cogl-gles2/cogl-gles2-1.0.pc
cogl-gles2/cogl-gles2-2.0-experimental.pc
@@ -1175,7 +1126,6 @@ fi
echo " Build libcogl-gles2 GLES 2.0 frontend api: ${enable_cogl_gles2}"
echo " Image backend: ${COGL_IMAGE_BACKEND}"
echo " Cogl Pango: ${enable_cogl_pango}"
-echo " Cogl Gstreamer: ${enable_cogl_gst}"
echo " Cogl Path: ${enable_cogl_path}"
# Compiler/Debug related flags
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]