Add libraw1394 and libcd1394 to the contrib build system. The libraries are needed for DV support.

extras/contrib/src/Makefile

@@ -192,10 +192,10 @@ else
    all: .iconv .intl .freetype .fribidi .zlib \
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
 	.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
-	.live .goom2k4 .caca .mod .x264  .xml .twolame\
-	.png .gpg-error .gcrypt .gnutls .mpcdec\
+	.live .goom2k4 .caca .mod .x264  .xml .twolame \
+	.png .gpg-error .gcrypt .gnutls .mpcdec \
 	.dvdnav .dvbpsi .wxwidgets .dirac \
-	.aclocal .libdca
+	.aclocal .libdca .libraw1394 .libdc1394
 #	.png .gpg-error .gcrypt .gnutls .mpcdec\
 #	.SDL_image  .daap .cddb .cdio .vcdimager 
    endif
@@ -1511,6 +1511,68 @@ DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
 # gpg-error 
 # ***************************************************************************
 
+# libraw1394
+# ***************************************************************************
+
+#ifdef SVN
+#libraw1394:
+#	$(SVN) co -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394  libraw1394
+#        (cd $<; libtoolize --copy --force; \
+#                autopoint -f; \
+#                aclocal -I extras/contrib/share/aclocal; \
+#                autoconf; \
+#                autoheader; \
+#                automake --add-missing --copy -Wall)
+#
+#else
+libraw1394-$(LIBRAW1394_VERSION).tar.gz:
+	$(WGET) $(LIBRAW1394_URL)
+
+libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz
+	$(EXTRACT_GZ)
+#endif
+
+.libraw1394: libraw1394
+	(cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PRFIX) install)
+	touch $@
+	
+CLEAN_file += .libraw1394
+CLEAN_PKG += libraw1394
+DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION)
+
+# ***************************************************************************
+# libdc1394
+# ***************************************************************************
+
+#ifdef SVN
+#libdc1394:
+#	$(SVN) co -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394  libdc1394
+#        (cd $<; libtoolize --copy --force; \
+#                autopoint -f; \
+#                aclocal -I extras/contrib/share/aclocal; \
+#                autoconf; \
+#                autoheader; \
+#                automake --add-missing --copy -Wall)
+#
+#else
+libdc1394-$(LIBDC1394_VERSION).tar.gz:
+	$(WGET) $(LIBDC1394_URL)
+
+libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz
+	$(EXTRACT_GZ)
+#endif
+
+.libdc1394: libdc1394
+	(cd $<; ./configure --prefix=$(PREFIX) && \
+	 patch -p1 < ../Patches/libdc1394-noexamples.patch && \
+	 make && make DESTDIR=$(PRFIX) install)
+	touch $@
+	
+CLEAN_file += .libdc1394
+CLEAN_PKG += libdc1394
+DISTCLEAN_PKG += libdc1394-$(LIBDC1394_VERSION)
+
+# ***************************************************************************
 libgpg-error-$(GPGERROR_VERSION).tar.gz:
 	$(WGET) $(GPGERROR_URL)
 

extras/contrib/src/Patches/libdc1394-noexamples.patch

+--- libdc1394-1.2.1/Makefile	2006-11-22 21:49:05.000000000 +0100
++++ libdc1394/Makefile	2006-11-22 21:48:12.000000000 +0100
+@@ -177,7 +177,7 @@ sbindir = ${exec_prefix}/sbin
+ sharedstatedir = ${prefix}/com
+ sysconfdir = ${prefix}/etc
+ target_alias = 
+-SUBDIRS = libdc1394 examples
++SUBDIRS = libdc1394 
+ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
+ 	stamp-h.in
+ 

extras/contrib/src/packages.mak

@@ -99,6 +99,12 @@ GOOM2k4_VERSION=2k4-0
 GOOM2k4_URL=$(SF)/goom/goom-$(GOOM2k4_VERSION)-src.tar.gz
 LIBCACA_VERSION=0.9
 LIBCACA_URL=http://libcaca.zoy.org/files/libcaca-$(LIBCACA_VERSION).tar.gz
+LIBDC1394_VERSION=1.2.1
+LIBDC1394_URL=http://surfnet.dl.sourceforge.net/sourceforge/libdc1394/libdc1394-$(LIBDC1394_VERSION).tar.gz
+LIBDC1394_SVN=https://svn.sourceforge.net/svnroot
+LIBRAW1394_VERSION=1.2.0
+LIBRAW1394_URL=http://surfnet.dl.sourceforge.net/sourceforge/libraw1394/libraw1394-$(LIBRAW1394_VERSION).tar.gz
+LIBRAW1394_SVN=https://svn.sourceforge.net/svnroot
 LIBDTS_VERSION=0.0.2
 LIBDTS_URL=http://debian.unnet.nl/pub/videolan/libdts/$(LIBDTS_VERSION)/libdts-$(LIBDTS_VERSION).tar.gz
 LIBDCA_SVN=svn://svn.videolan.org/libdca/trunk