Fixed compilation against GStreamer 1.4

Author: fancycode

configure.ac

@@ -160,9 +160,15 @@ CFLAGS="$CFLAGS $GST_CFLAGS"
 gst_version=unknown
 # The order of these tests is important.
 AC_TRY_COMPILE([#include <gst/gst.h>],
+[#if !GST_CHECK_VERSION(1,4,0)
+#error "not 1.4.0"
+#endif], USE_GSTREAMER_VERSION=1.4 gst_version=1.4.0)
+if test $gst_version = unknown; then
+AC_TRY_COMPILE([#include <gst/gst.h>],
 [#if !GST_CHECK_VERSION(1,2,0)
 #error "not 1.2.0"
 #endif], USE_GSTREAMER_VERSION=1.2 gst_version=1.2.0)
+fi
 if test $gst_version = unknown; then
 AC_TRY_COMPILE([#include <gst/gst.h>],
 [#if !GST_CHECK_VERSION(1,0,0)
@@ -173,27 +179,32 @@ if test $gst_version = unknown; then
 USE_GSTREAMER_VERSION=0.10
 gst_version=0.10.0
 fi
-AC_SUBST(USE_GSTREAMER_VERSION) 
+AC_SUBST(USE_GSTREAMER_VERSION)
 AC_MSG_RESULT($gst_version)
 CFLAGS="$save_CFLAGS"
 
-PKG_CHECK_MODULES(zlib, [zlib], [
-  AC_SUBST(zlib_CFLAGS)
-  AC_SUBST(zlib_LIBS)
-], [
-  AC_MSG_ERROR([You need to install the zlib development package.])
-])
+AM_CONDITIONAL([INCLUDE_MATROSKA_DEMUXER], [test "$USE_GSTREAMER_VERSION" != "1.4"])
+AM_CONDITIONAL([INCLUDE_MP4_DEMUXER], [test "$USE_GSTREAMER_VERSION" != "1.4"])
 
-save_LIBS="$LIBS"
-AC_SEARCH_LIBS([BZ2_bzDecompressInit], [bz2], [
-  bz2_CFLAGS=""
-  bz2_LIBS="-lbz2"
-  AC_SUBST(bz2_CFLAGS)
-  AC_SUBST(bz2_LIBS)
-], [
-  AC_MSG_ERROR([You need to install the bz2 development package.])
-])
-LIBS="$save_LIBS"
+if eval "test $USE_GSTREAMER_VERSION != 1.4" ; then
+  PKG_CHECK_MODULES(zlib, [zlib], [
+    AC_SUBST(zlib_CFLAGS)
+    AC_SUBST(zlib_LIBS)
+  ], [
+    AC_MSG_ERROR([You need to install the zlib development package.])
+  ])
+
+  save_LIBS="$LIBS"
+  AC_SEARCH_LIBS([BZ2_bzDecompressInit], [bz2], [
+    bz2_CFLAGS=""
+    bz2_LIBS="-lbz2"
+    AC_SUBST(bz2_CFLAGS)
+    AC_SUBST(bz2_LIBS)
+  ], [
+    AC_MSG_ERROR([You need to install the bz2 development package.])
+  ])
+  LIBS="$save_LIBS"
+fi
 
 PKG_CHECK_MODULES(libde265, [libde265 >= 0.7], [
   AC_SUBST(libde265_CFLAGS)

src/Makefile.am

@@ -5,7 +5,10 @@ libgstlibde265_la_SOURCES = \
 	libde265-dec.c \
 	libde265-dec.h \
 	common/codec-utils.h \
-	common/codec-utils.c \
+	common/codec-utils.c
+
+if INCLUDE_MATROSKA_DEMUXER
+libgstlibde265_la_SOURCES += \
 	matroska/$(USE_GSTREAMER_VERSION)/ebml-ids.h \
 	matroska/$(USE_GSTREAMER_VERSION)/ebml-read.c \
 	matroska/$(USE_GSTREAMER_VERSION)/ebml-read.h \
@@ -18,7 +21,11 @@ libgstlibde265_la_SOURCES = \
 	matroska/$(USE_GSTREAMER_VERSION)/matroska-parse.c \
 	matroska/$(USE_GSTREAMER_VERSION)/matroska-parse.h \
 	matroska/$(USE_GSTREAMER_VERSION)/matroska-read-common.c \
-	matroska/$(USE_GSTREAMER_VERSION)/matroska-read-common.h \
+	matroska/$(USE_GSTREAMER_VERSION)/matroska-read-common.h
+endif
+
+if INCLUDE_MP4_DEMUXER
+libgstlibde265_la_SOURCES += \
 	isomp4/$(USE_GSTREAMER_VERSION)/qtatomparser.h   \
 	isomp4/$(USE_GSTREAMER_VERSION)/qtdemux.h        \
 	isomp4/$(USE_GSTREAMER_VERSION)/qtdemux_types.h  \
@@ -41,37 +48,54 @@ libgstlibde265_la_SOURCES = \
 	isomp4/$(USE_GSTREAMER_VERSION)/atomsrecovery.c  \
 	isomp4/$(USE_GSTREAMER_VERSION)/descriptors.c    \
 	isomp4/$(USE_GSTREAMER_VERSION)/properties.c
+endif
 
 libgstlibde265_la_CFLAGS = \
 	$(GST_CFLAGS) \
 	$(GST_PLUGIN_CFLAGS) \
-	$(libde265_CFLAGS) \
+	$(libde265_CFLAGS)
+
+libgstlibde265_la_LIBADD = \
+	$(GST_LIBS) \
+	$(GST_PLUGIN_LIBS) \
+	$(libde265_LIBS)
+
+if INCLUDE_MATROSKA_DEMUXER
+libgstlibde265_la_CFLAGS += \
 	$(zlib_CFLAGS) \
 	$(bz2_CFLAGS) \
 	-DHAVE_ZLIB \
 	-DHAVE_BZ2
-libgstlibde265_la_LIBADD = \
-	$(GST_LIBS) \
-	$(GST_PLUGIN_LIBS) \
-	$(libde265_LIBS) \
+
+libgstlibde265_la_LIBADD += \
 	$(zlib_LIBS) \
 	$(bz2_LIBS)
+endif
+
 libgstlibde265_la_LDFLAGS = \
 	$(GST_LDFLAGS) \
 	$(GST_PLUGIN_LDFLAGS)
+
 libgstlibde265_la_LIBTOOLFLAGS = \
 	--tag=disable-static
 
 noinst_HEADERS = \
 	libde265-dec.h \
-	common/codec-utils.h \
+	common/codec-utils.h
+
+if INCLUDE_MATROSKA_DEMUXER
+noinst_HEADERS += \
 	matroska/$(USE_GSTREAMER_VERSION)/ebml-ids.h \
 	matroska/$(USE_GSTREAMER_VERSION)/ebml-read.h \
 	matroska/$(USE_GSTREAMER_VERSION)/lzo.h \
 	matroska/$(USE_GSTREAMER_VERSION)/matroska-demux.h \
 	matroska/$(USE_GSTREAMER_VERSION)/matroska-ids.h \
 	matroska/$(USE_GSTREAMER_VERSION)/matroska-parse.h \
-	matroska/$(USE_GSTREAMER_VERSION)/matroska-read-common.h \
+	matroska/$(USE_GSTREAMER_VERSION)/matroska-read-common.h
+endif
+
+if INCLUDE_MP4_DEMUXER
+noinst_HEADERS += \
 	isomp4/$(USE_GSTREAMER_VERSION)/qtatomparser.h   \
 	isomp4/$(USE_GSTREAMER_VERSION)/qtdemux.h        \
 	isomp4/$(USE_GSTREAMER_VERSION)/qtdemux_types.h  \
@@ -85,6 +109,7 @@ noinst_HEADERS = \
 	isomp4/$(USE_GSTREAMER_VERSION)/properties.h     \
 	isomp4/$(USE_GSTREAMER_VERSION)/fourcc.h         \
 	isomp4/$(USE_GSTREAMER_VERSION)/ftypcc.h
+endif
 
 EXTRA_DIST = \
 	common/*.c \

src/gstlibde265.c

@@ -30,19 +30,22 @@
 
 #include "libde265-dec.h"
 
+#if !GST_CHECK_VERSION(1,4,0)
 GST_DEBUG_CATEGORY_EXTERN (matroskareadcommon_debug);
 
 void gst_matroska_register_tags (void);
 gboolean gst_matroska_demux_plugin_init (GstPlugin * plugin);
 gboolean gst_matroska_parse_plugin_init (GstPlugin * plugin);
 gboolean gst_isomp4_plugin_init (GstPlugin * plugin);
+#endif
 
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  gboolean ret;
+  gboolean ret = TRUE;
 
   gst_pb_utils_init ();
+#if !GST_CHECK_VERSION(1,4,0)
   gst_matroska_register_tags ();
 
   GST_DEBUG_CATEGORY_INIT (matroskareadcommon_debug, "matroskareadcommon", 0,
@@ -51,6 +54,7 @@ plugin_init (GstPlugin * plugin)
   ret = gst_matroska_demux_plugin_init (plugin);
   ret &= gst_matroska_parse_plugin_init (plugin);
   ret &= gst_isomp4_plugin_init (plugin);
+#endif
   ret &= gst_libde265_dec_plugin_init (plugin);
   return ret;
 }