mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

raw1394: Don't compile hdv1394src if libiec61883 isn't available

Browse source 
Fixes #629896
This commit is contained in:
Edward Hervey 2010-10-04 22:31:32 +02:00
parent 4c2f5333bb
commit 9481c8a1a0
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -864,6 +864,7 @@ AG_GST_CHECK_FEATURE(DV1394, [raw1394 and avc1394 library], 1394, [
fi fi
fi fi
]) ])
AM_CONDITIONAL(USE_LIBIEC61883, [ test "x${HAVE_LIBIEC61883}" = xyes ] )
dnl *** shout2 *** dnl *** shout2 ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SHOUT2, true) translit(dnm, m, l) AM_CONDITIONAL(USE_SHOUT2, true)

12
ext/raw1394/Makefile.am
View file

@ -1,7 +1,15 @@
plugin_LTLIBRARIES = libgst1394.la plugin_LTLIBRARIES = libgst1394.la
if USE_LIBIEC61883
hdvsource = gsthdv1394src.c
hdvheaders = gsthdv1394src.h
else
hdvsource =
hdvheaders =
endif
libgst1394_la_SOURCES = \ libgst1394_la_SOURCES = \
gst1394.c gst1394probe.c gstdv1394src.c gsthdv1394src.c \ gst1394.c gst1394probe.c gstdv1394src.c $(hdvsource) \
gst1394clock.c gst1394clock.c
libgst1394_la_CFLAGS = \ libgst1394_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \
@ -16,6 +24,6 @@ libgst1394_la_LIBADD = \
libgst1394_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgst1394_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgst1394_la_LIBTOOLFLAGS = --tag=disable-static libgst1394_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = gstdv1394src.h gst1394probe.h gsthdv1394src.h \ noinst_HEADERS = gstdv1394src.h gst1394probe.h $(hdvheaders) \
gst1394clock.h gst1394clock.h

4
ext/raw1394/gst1394.c
View file

@ -25,7 +25,9 @@
#include "gstdv1394src.h" #include "gstdv1394src.h"
#ifdef HAVE_LIBIEC61883
#include "gsthdv1394src.h" #include "gsthdv1394src.h"
#endif
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
@ -33,9 +35,11 @@ plugin_init (GstPlugin * plugin)
if (!gst_element_register (plugin, "dv1394src", GST_RANK_NONE, if (!gst_element_register (plugin, "dv1394src", GST_RANK_NONE,
GST_TYPE_DV1394SRC)) GST_TYPE_DV1394SRC))
return FALSE; return FALSE;
#ifdef HAVE_LIBIEC61883
if (!gst_element_register (plugin, "hdv1394src", GST_RANK_NONE, if (!gst_element_register (plugin, "hdv1394src", GST_RANK_NONE,
GST_TYPE_HDV1394SRC)) GST_TYPE_HDV1394SRC))
return FALSE; return FALSE;
#endif
return TRUE; return TRUE;
} }