[gst-cvs] thomasvs gst-plugins: gst-plugins/ gst-plugins/ext/ gst-plugins/ext/raw1394/

[<tho...@fr...>]

CVS Root:       /home/cvs/gstreamer
Module:         gst-plugins
Changes by:     thomasvs
Date:           Wed Oct 20 2004  06:51:40 PDT

Log message:
fix the build

Modified files:
    .               : ChangeLog configure.ac
    ext             : Makefile.am
    ext/raw1394     : Makefile.am

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.1185&r2=1.1186
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/configure.ac.diff?r1=1.475&r2=1.476
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/Makefile.am.diff?r1=1.110&r2=1.111
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/raw1394/Makefile.am.diff?r1=1.8&r2=1.9

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /home/cvs/gstreamer/gst-plugins/ChangeLog,v
retrieving revision 1.1185
retrieving revision 1.1186
diff -u -d -r1.1185 -r1.1186
--- ChangeLog	20 Oct 2004 12:02:19 -0000	1.1185
+++ ChangeLog	20 Oct 2004 13:51:25 -0000	1.1186
@@ -1,3 +1,10 @@
+2004-10-20  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+	* ext/Makefile.am:
+	* ext/raw1394/Makefile.am:
+	  fix the build
 2004-10-20  Ronald S. Bultje  <rb...@ro...>
 
 	* ext/ogg/gstoggdemux.c: (gst_ogg_demux_iterate):
Index: configure.ac
RCS file: /home/cvs/gstreamer/gst-plugins/configure.ac,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -d -r1.475 -r1.476
--- configure.ac	18 Oct 2004 15:37:57 -0000	1.475
+++ configure.ac	20 Oct 2004 13:51:25 -0000	1.476
@@ -1382,11 +1382,30 @@
   AC_SUBST(PANGO_LIBS)
 ])
-dnl *** raw1394 ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_RAW1394, true)
-GST_CHECK_FEATURE(RAW1394, [raw1394 library], dv1394src, [
-  GST_CHECK_LIBHEADER(RAW1394, raw1394, raw1394_new_handle,, libraw1394/raw1394.h, RAW1394_LIBS="-lraw1394")
-  AC_SUBST(RAW1394_LIBS)
+dnl *** dv1394 ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_DV1394, true)
+GST_CHECK_FEATURE(DV1394, [raw1394 and avc1394 library], dv1394src, [
+  dnl we need to test three headers and three libs
+  GST_CHECK_LIBHEADER(RAW1394,
+    raw1394, raw1394_new_handle,,
+    libraw1394/raw1394.h, RAW1394_LIBS="-lraw1394")
+  GST_CHECK_LIBHEADER(AVC1394,
+    avc1394, avc1394_send_command, $RAW1394_LIBS,
+    libavc1394/avc1394.h, AVC1394_LIBS="-lavc1394")
+  GST_CHECK_LIBHEADER(ROM1394,
+    rom1394, rom1394_free_directory, $RAW1394_LIBS,
+    libavc1394/rom1394.h, ROM1394_LIBS="-lrom1394")
+  dnl now see how far we got
+  if test x$HAVE_RAW1394 = xyes && \
+     test x$HAVE_AVC1394 = xyes && \
+     test x$HAVE_ROM1394 = xyes; then
+       HAVE_DV1394=yes
+       DV1394_LIBS="$RAW1394_LIBS $AVC1394_LIBS $ROM1394_LIBS"
+       AC_SUBST(DV1394_LIBS)
+  else
+       HAVE_DV1394=no
+  fi
 dnl *** SDL ***
Index: Makefile.am
RCS file: /home/cvs/gstreamer/gst-plugins/ext/Makefile.am,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- Makefile.am	5 Oct 2004 15:32:43 -0000	1.110
+++ Makefile.am	20 Oct 2004 13:51:27 -0000	1.111
@@ -256,10 +256,10 @@
 PANGO_DIR=
 endif
-if USE_RAW1394
-RAW1394_DIR=raw1394
+if USE_DV1394
+DV1394_DIR=raw1394
 else
-RAW1394_DIR=
+DV1394_DIR=
 if USE_SDL
RCS file: /home/cvs/gstreamer/gst-plugins/ext/raw1394/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	9 Aug 2003 23:56:38 -0000	1.8
+++ Makefile.am	20 Oct 2004 13:51:27 -0000	1.9
@@ -3,7 +3,7 @@
 libgst1394_la_SOURCES = gst1394.c gstdv1394src.c
 libgst1394_la_CFLAGS = $(GST_CFLAGS)
-libgst1394_la_LIBADD = $(RAW1394_LIBS) 
+libgst1394_la_LIBADD = $(DV1394_LIBS) 
 libgst1394_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 noinst_HEADERS = gstdv1394src.h