Try to make libdc1394 plugin work now that we have fixed swscale, x264 and fluidsynth

1 files changed, 13 insertions, 9 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 8f3ea74f..991bd5fa 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -326,7 +326,7 @@ MPCDEC=1.2.6
 MPEG2DEC=0.5.1
 OIL=0.3.16
 QT4=4.4.3
-RAW1394=1.3.0
+RAW1394=2.1.2
 SCHROEDINGER=1.0.7
 SHOUT=2.2.2
 SPEEX=1.2rc1
@@ -2011,9 +2011,9 @@ echo -e "**\n**  1394 ...\n**"
 OLDDIR=$(pwd)
 cd $TMP/tmp-$PRGNAM/libraw1394-${RAW1394}
 
-# Or else vlc compilation fails with "error: redefinition of typedef 'byte_t'"
-patch -p0 --verbose < $SRCDIR/libraw1394_typedef.patch \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_raw1394.log
+## Or else vlc compilation fails with "error: redefinition of typedef 'byte_t'"
+#patch -p0 --verbose < $SRCDIR/libraw1394_typedef.patch \
+#  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_raw1394.log
 
 # Seems I need this ugly prefix or else I have to dig into the problem of vlc
 # incorrectly interpreting *.la contents...
@@ -2096,7 +2096,7 @@ includedir=\${prefix}/include
 Name: libdc1394
 Description: High level programming interface for IEEE1394 digital camera.
 Version: ${DC1394}
-Libs: -L\${libdir} -ldc1394_control
+Libs: -L\${libdir} -ldc1394_control -lraw1394
 Cflags: -I\${includedir}/libdc1394
 EOT
 # Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -2160,6 +2160,8 @@ make -j${JOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_fluid.log
 echo -e "\n**\n**\n"
 make install DESTDIR=$VLCDEPSDIR \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_fluid.log
+# Fix a missing link dependency (resolves 'unknown symbols' runtime):
+sed -i -e "/^Libs:/s/$/ -lasound/" $VLCDEPSDIR/usr/lib/pkgconfig/fluidsynth.pc
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/fluidsynth/
 cp AUTHORS COPYING ChangeLog NEWS README THANKS TODO \
@@ -2397,8 +2399,6 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             --enable-lua \
             --enable-pvr \
             --enable-dc1394 \
-            --with-dv-raw1394=$TMP/tmp-$PRGNAM/libraw1394-${RAW1394} \
-            --with-dv-avc1394=$TMP/tmp-$PRGNAM/libavc1394-${AVC1394} \
             --enable-dv \
             --enable-dvbpsi \
             --enable-dvdnav \
@@ -2414,7 +2414,6 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             --enable-v4l \
             --enable-caca \
             --enable-aa \
-            --enable-ggi \
             --disable-galaktos \
             --enable-switcher \
             --enable-upnp \
@@ -2458,6 +2457,7 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             #--with-dvdread-tree=$TMP/tmp-$PRGNAM/libdvdread-$DVDREAD \
             #--enable-goom \
             #--with-goom-tree=$TMP/tmp-$PRGNAM/goom$GOOM \
+            #--enable-ggi \
 
             # Sometimes skins support breaks and we'll have to disable it:
             #--disable-skins2 \
@@ -2469,6 +2469,10 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             # library works on x86_64: 
             #--with-x264-tree=$TMP/tmp-$PRGNAM/x264-snapshot-$X264 \
 
+            # Without these, we get also rid of "unknown symbols" runtime
+            #--with-dv-raw1394=$TMP/tmp-$PRGNAM/libraw1394-${RAW1394} \
+            #--with-dv-avc1394=$TMP/tmp-$PRGNAM/libavc1394-${AVC1394} \
+
             # Deprecated:
             #--enable-ffmpeg \
             #--with-ffmpeg-tree=$TMP/tmp-$PRGNAM/ffmpeg-${FFMPEG} \
@@ -2693,7 +2697,7 @@ else
   make_lua
 
   make_goom
-  make_ggi
+  #make_ggi
 
   make_dv
   make_dvbpsi