Split out ebml build - matroska support was broken because libmkv_plugin.so is missing from the package. VLC needs to see the ebml headers & libs now.

1 files changed, 27 insertions, 9 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 1f159fa4..ced4b1ac 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -555,6 +555,7 @@ LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
             --enable-static \
             --disable-shared \
+            --disable-examples \
             --program-prefix="" \
             --program-suffix="" \
             --build=$ARCH-slackware-linux \
@@ -709,6 +710,7 @@ LDFLAGS="$SLKLDFLAGS" \
             --disable-ffserver \
             --disable-debug \
             --disable-shared \
+            --disable-swscaler \
             --enable-static \
             --logfile=$OUTPUT/ffmpeg.conf.log \
             --extra-cflags="-I`pwd`/../vlcdeps/usr/include" \
@@ -830,19 +832,32 @@ cd -
 }
 
 # -----------------------------------------------------------------------------
-# Compile matroska
+# Compile ebml
 # -----------------------------------------------------------------------------
-make_matroska()
+make_ebml()
 {
-echo -e "**\n**  ebml and matroska ...\n**"
+echo -e "**\n**  ebml ...\n**"
 cd $TMP/tmp-$PRGNAM/libebml-$EBML/make/linux
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 make staticlib prefix=/usr \
-  2>&1 | tee $OUTPUT/make-${PRGNAM}_matroska.log
+  2>&1 | tee $OUTPUT/make-${PRGNAM}_ebml.log
+# Install into a temp directory where vlc & matroska can pick it up:
+make install_staticlib install_headers \
+  prefix=`pwd`/../../../vlcdeps/usr \
+  includedir=`pwd`/../../../vlcdeps/usr/include/ebml \
+  libdir=`pwd`/../../../vlcdeps/usr/lib \
+  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ebml.log
 cd -
-echo -e "**\n**\n**" >> $OUTPUT/make-${PRGNAM}_matroska.log
+}
+
+# -----------------------------------------------------------------------------
+# Compile matroska
+# -----------------------------------------------------------------------------
+make_matroska()
+{
+echo -e "**\n**  matroska ...\n**"
 cd $TMP/tmp-$PRGNAM/libmatroska-$MATROSKA/make/linux
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -850,7 +865,7 @@ LDFLAGS="$SLKLDFLAGS" \
 make staticlib prefix=/usr \
   LIBEBML_INCLUDE_DIR=`pwd`/../../../libebml-$EBML \
   LIBEBML_LIB_DIR=`pwd`/../../../libebml-$EBML/make/linux \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_matroska.log
+  2>&1 | tee $OUTPUT/make-${PRGNAM}_matroska.log
 # Install into a temp directory where vlc can pick it up:
 make install_staticlib install_headers \
   prefix=`pwd`/../../../vlcdeps/usr \
@@ -1490,13 +1505,14 @@ sed -i -e 's|/lib/vlc|/usr/lib${LIBDIRSUFFIX}/vlc|g' vlc-config.in.in configure*
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 # Fix compilation errors for recent (end 2007) versions of ffmpeg:
-# No longer needed for vlc-0.9.6e
+# No longer needed for vlc-0.8.6e
 #cat $SRCDIR/vlc_ffmpeg_mux.patch | patch -p1 \
 #  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 # Fix compilation errors for cdio version > 0.78.2
-cat $SRCDIR/vlc_libcdio-0.78.2.patch | patch -p1 \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+# Does no longer seem to work - vlc-0.8.6h
+#cat $SRCDIR/vlc_libcdio-0.78.2.patch | patch -p1 \
+#  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 # Preparations for building a separate vlc mozilla plugin :
 if [ "$MOZPLUGIN" == "YES" ]; then
@@ -1714,6 +1730,7 @@ rm -rf $PKG/usr/share/doc
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
 cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
+chown -r root:root $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 # Compress the man page(s)
 if [ -d $PKG/usr/man ]; then
@@ -1814,6 +1831,7 @@ if [ "${USE_PATENTS}" == "YES" ]; then
 fi
 make_a52
 make_live555
+make_ebml
 make_matroska
 make_mpeg2dec
 make_mpcdec