Fix the x264 encoder on x86_64, fix libdc1394_plugin.so

1 files changed, 24 insertions, 6 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 8c5da4fb..8f3ea74f 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -1894,11 +1894,11 @@ make -j${JOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x264.log
 # Install x264 into a temp location so vlc can pickup the library
 make install DESTDIR=$VLCDEPSDIR \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x264.log
-# Need this to link vlc successfully on x86_64:
-if [ "$ARCH" == "x86_64" ]; then
-  find . -name libx264.a -exec strip {} \;
-  find $VLCDEPSDIR -name libx264.a -exec strip {} \;
-fi
+## Need this to link vlc successfully on x86_64:
+#if [ "$ARCH" == "x86_64" ]; then
+#  find . -name libx264.a -exec strip {} \;
+#  find $VLCDEPSDIR -name libx264.a -exec strip {} \;
+#fi
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/x264/
 cp AUTHORS COPYING \
@@ -2084,6 +2084,21 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib/pkgconfig" \
 make -j${JOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dc1394.log
 # Install libdc1394 into a temp location so vlc can pickup the library
 make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dc1394.log
+# Install a pkgconfig file or else the libdc1394_control library will not
+# be linked to correctly and libdc1394_plugin.so will not load:
+mkdir -p $VLCDEPSDIR/usr/lib/pkgconfig
+cat <<EOT > $VLCDEPSDIR/usr/lib/pkgconfig/libdc1394.pc
+prefix=$VLCDEPSDIR/usr
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib
+includedir=\${prefix}/include
+
+Name: libdc1394
+Description: High level programming interface for IEEE1394 digital camera.
+Version: ${DC1394}
+Libs: -L\${libdir} -ldc1394_control
+Cflags: -I\${includedir}/libdc1394
+EOT
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libdc1394/
 cp AUTHORS COPYING ChangeLog NEWS README \
@@ -2413,7 +2428,6 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             --enable-speex \
             --with-speex-tree=$TMP/tmp-$PRGNAM/speex-$SPEEX \
             --enable-x264 \
-            --with-x264-tree=$TMP/tmp-$PRGNAM/x264-snapshot-$X264 \
             --enable-a52 \
             --with-a52-tree=$TMP/tmp-$PRGNAM/a52dec-$A52 \
             --enable-faad \
@@ -2451,6 +2465,10 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             # Got errors about missing sdt.h in ./modules/access/dvb/access.c
             #--with-dvbpsi-tree=$TMP/tmp-$PRGNAM/libdvbpsi5-${DVBPSI} \
 
+            # Leave this out so that linking the static x264.a into a shared
+            # library works on x86_64: 
+            #--with-x264-tree=$TMP/tmp-$PRGNAM/x264-snapshot-$X264 \
+
             # Deprecated:
             #--enable-ffmpeg \
             #--with-ffmpeg-tree=$TMP/tmp-$PRGNAM/ffmpeg-${FFMPEG} \