First attempt at building vlc-2.1.0 from git, with many updated internal libraries

1 files changed, 65 insertions, 89 deletions

diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index ec5d67ca..52e5500e 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -359,6 +359,12 @@
 #               static linking of DVDCSS.
 # 2.0.8-1     10/aug/2013  by Eric Hameleers <alien@slackware.com>
 #             * New release.
+# 2.1.0-1     xx/xxx/2013  by Eric Hameleers <alien@slackware.com>
+#             * New release. Removed the internal v4l-utils since Slackware's
+#               own is good enough. Many upgrades to internal libraries:
+#               ffmpeg, fluidsynth, libass, libcdio, libdc1394, libdvbpsi,
+#               libebml, libmatroska, libva, opus, orc, schroedinger,
+#               vcdimager, vo-amrwbenc, x264.
 #
 # Run 'sh vlc.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -386,7 +392,7 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-"alien"}
 
 PKGTYPE=${PKGTYPE:-"txz"}
-SLACKVER=$(cat /etc/slackware-version| cut -d' ' -f2)
+SLACKVER=${SLACKVER:-$(cat /etc/slackware-version| cut -d' ' -f2)}
 
 # VERSION value may be modified later!
 # * If VERSION is set to "HEAD" or to any value starting with "20",
@@ -399,18 +405,19 @@ SLACKVER=$(cat /etc/slackware-version| cut -d' ' -f2)
 # Hint: checkout at a certain date takes a snapshot at 00:00, not 23:59)
 #
 # Acceptible formats:
-#VERSION=${VERSION:-"2.0.0"}
-#VERSION=${VERSION:-"20120217"}
+#VERSION=${VERSION:-"2.0.8"}
+#VERSION=${VERSION:-"20130181"}
 #VERSION=${VERSION:-"HEAD"}
-#VERSION=${VERSION:-"master#20120217"}
+#VERSION=${VERSION:-"master#20130818"}
 #VERSION=${VERSION:-"@1.1.0-bugfix#20120217"}
-#VERSION=${VERSION:-"master@git://git.videolan.org/vlc/vlc-2.0.git#20120217"}
+#VERSION=${VERSION:-"master@git://git.videolan.org/vlc/vlc-2.1.git#20130818"}
 
-VERSION=${VERSION:-"2.0.8"}
+#VERSION=${VERSION:-"2.0.8"}
+VERSION=${VERSION:-"20130818"}
 
 # At some point, the 1.2 development branched off the master tree:
 #DEFGITURI=${GITURI:-"git://git.videolan.org/vlc.git"}
-DEFGITURI=${GITURI:-"git://git.videolan.org/vlc/vlc-2.0.git"}
+DEFGITURI=${GITURI:-"git://git.videolan.org/vlc/vlc-2.1.git"}
 
 DOCS="ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS README THANKS"
 
@@ -504,27 +511,27 @@ MOZPLUGIN=$(echo $MOZPLUGIN | tr 'a-z' 'A-Z')
 # Dependent package versions
 A52=0.7.4
 AACENC=0.1.2
-AMRWBENC=0.1.2
+AMRWBENC=0.1.3
 AMR=0.1.3
-ASS=0.10.0
+ASS=0.10.1
 AVC1394=0.5.4
 BLURAY=0.3.0
 CDDB=1.3.2
-CDIO=0.82
+CDIO=0.90
 DAAP=0.4.0
-DC1394=2.1.2
+DC1394=2.2.1
 DCA=0.0.5
 DV=1.0.0
-DVBPSI=0.2.2
+DVBPSI=1.1.0
 DVDNAV=20130528
 DVDREAD=20130528
 DVDCSS=1.2.13
-EBML=1.2.2
+EBML=1.3.0
 FAAC=1.28
 FAAD2=2.7
-#FFMPEG=1.0
-FFMPEG=23eed00  # git snapshot 20130308
-FLUID=1.1.5
+#FFMPEG=23eed00  # git snapshot 20130308
+FFMPEG=2.0.1
+FLUID=1.1.6
 FRIBIDI=0.19.5
 GGI=2.2.2
 GII=1.0.2
@@ -532,20 +539,20 @@ GOOM=2k4-0
 GSM=1.0.13
 KATE=0.4.1
 LAME=3.99.5
-LIBVA="0.32.0-1+sds2"
+LIBVA=1.2.1
 LIVE=2012.12.18
 LUA=5.1.5
-MATROSKA=1.3.0
+MATROSKA=1.4.0
 MPCDEC=r475
 MPEG2DEC=0.5.1
-NPAPI=20130408    #tag:2.0.6
-OPUS=1.0.1
-ORC=0.4.16
+NPAPI=20130818
+OPUS=1.0.3
+ORC=0.4.17
 PROJECTM=2.0.1
-QT4=4.7.4
+QT4=4.8.5
 RAW1394=2.0.5
 RTMP=2.3
-SCHROEDINGER=1.0.10
+SCHROEDINGER=1.0.11
 SHOUT=2.3.1
 SPEEX=1.2rc1
 SWSCALE=""       # Set SWSCALE="" to checkout a version of ffmpeg's swscale
@@ -554,10 +561,9 @@ THEORA=1.1.1
 TIGER=0.3.4
 TWOLAME=0.3.13
 UPNP=1.6.18
-V4L=0.8.8
-VCD=0.7.23
+VCD=0.7.24
 VPX=v1.1.0
-X264=20130407-2245
+X264=20130817-2245
 
 # Determine what X we're running (the modular X returns the prefix
 # in the next command, while older versions stay silent):
@@ -626,9 +632,9 @@ SRCPAT[0]="NO"
 USE[0]="YES"
 
 # ffmpeg libraries
-SOURCE[1]="$SRCDIR/ffmpeg-${FFMPEG}.tar.gz"
-SRCURL[1]="http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=${FFMPEG};sf=tgz"
-#SRCURL[1]="http://ffmpeg.mplayerhq.hu/releases/ffmpeg-${FFMPEG}.tar.bz2"
+SOURCE[1]="$SRCDIR/ffmpeg-${FFMPEG}.tar.bz2"
+SRCURL[1]="https://ffmpeg.org/releases/ffmpeg-${FFMPEG}.tar.bz2"
+#SRCURL[1]="http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=${FFMPEG};sf=tgz"
 #SRCURL[1]=""
 SRCPAT[1]="NO"
 USE[1]="YES"
@@ -862,9 +868,9 @@ SRCURL[39]="http://downloads.sourceforge.net/fluidsynth/fluidsynth-${FLUID}.tar.
 SRCPAT[39]="NO"
 USE[39]="YES"
 
-# libv4l: Collection of video4linux support libraries
-SOURCE[40]="$SRCDIR/v4l-utils-${V4L}.tar.bz2"
-SRCURL[40]="http://linuxtv.org/downloads/v4l-utils/v4l-utils-${V4L}.tar.bz2"
+# opus codec:
+SOURCE[40]="$SRCDIR/opus-${OPUS}.tar.gz"
+SRCURL[40]="http://downloads.xiph.org/releases/opus/opus-${OPUS}.tar.gz"
 SRCPAT[40]="NO"
 USE[40]="YES"
 
@@ -875,8 +881,8 @@ SRCPAT[41]="NO"
 USE[41]="YES"
 
 # VAAPI for video hardware acceleration:
-SOURCE[42]="$SRCDIR/libva_${LIBVA}.tar.gz"
-SRCURL[42]="http://www.splitted-desktop.com/~gbeauchesne/libva/libva_${LIBVA}.tar.gz"
+SOURCE[42]="$SRCDIR/libva-${LIBVA}.tar.bz2"
+SRCURL[42]="http://www.freedesktop.org/software/vaapi/releases/libva/libva-${LIBVA}.tar.bz2"
 SRCPAT[42]="NO"
 USE[42]="YES"
 
@@ -930,17 +936,11 @@ SRCURL[50]="http://rtmpdump.mplayerhq.hu/download/rtmpdump-${RTMP}.tgz"
 SRCPAT[50]="NO"
 USE[50]="YES"
 
-# opus codec:
-SOURCE[51]="$SRCDIR/opus-${OPUS}.tar.gz"
-SRCURL[51]="http://downloads.xiph.org/releases/opus/opus-${OPUS}.tar.gz"
-SRCPAT[51]="NO"
-USE[51]="YES"
-
 # CSS decoding- VLC can do without if you install an external libdvdcss package.
-SOURCE[52]="$SRCDIR/libdvdcss-${DVDCSS}.tar.bz2"
-SRCURL[52]="http://download.videolan.org/pub/libdvdcss/${DVDCSS}/libdvdcss-${DVDCSS}.tar.bz2"
-SRCPAT[52]="YES"
-USE[52]="YES"
+SOURCE[51]="$SRCDIR/libdvdcss-${DVDCSS}.tar.bz2"
+SRCURL[51]="http://download.videolan.org/pub/libdvdcss/${DVDCSS}/libdvdcss-${DVDCSS}.tar.bz2"
+SRCPAT[51]="YES"
+USE[51]="YES"
 
 # Use the src_checkout() function if no downloadable tarball exists.
 # This function checks out sources from SVN/CVS and creates a tarball of them.
@@ -1616,8 +1616,9 @@ export CXXFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS"
 export OPENSOURCE_CXXFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS"
 export LDFLAGS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS"
 export PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig"
-echo "o
-yes" | ./configure \
+./configure \
+  -confirm-license \
+  -opensource \
   -prefix $VLCDEPSDIR \
   -libdir $VLCDEPSDIR/lib${LIBDIRSUFFIX} \
   -release \
@@ -2271,6 +2272,9 @@ cd $TMP/tmp-$PRGNAM/schroedinger-$SCHROEDINGER
 cat $SRCDIR/schroedinger_notests.patch | patch -p1 --verbose \
   2>&1 | tee $OUTPUT/patch-${PRGNAM}_schroedinger.log
 
+# Since the patch touches Makefile.am we have to reconfigure:
+autoreconf -vif
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
@@ -2988,43 +2992,12 @@ cd -
 
 
 # -----------------------------------------------------------------------------
-# Compile v4l libraries
-# -----------------------------------------------------------------------------
-make_v4l()
-{
-echo -e "**\n**  v4l ...\n**"
-cd $TMP/tmp-$PRGNAM/v4l-utils-${V4L}
-
-# Apply patch for proper DESTDIR support:
-cat $SRCDIR/v4l-utils.destdir.patch | patch -p1 --verbose \
-  2>&1 | tee $OUTPUT/patch-${PRGNAM}_v4l.log
-mkdir ${VLCDEPSDIR}/etc
-
-export CFLAGS="$SLKCFLAGS"
-export CPPFLAGS="$SLKCFLAGS"
-export LDFLAGS="$SLKLDFLAGS -ljpeg"
-make -j${NUMJOBS} -C lib LINKTYPE=static PREFIX=$VLCDEPSDIR/usr LIBDIR=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} SYSCONFDIR=$VLCDEPSDIR/etc 2>&1 | tee $OUTPUT/make-${PRGNAM}_v4l.log
-# Strip the static lib to prevent linking errors in 64-bit,
-# and fix the pkg-config file (to fix unresolved symbols in the plugin)
-find . -name "*.a" | xargs strip --strip-unneeded
-sed -i "/^Libs: /s/$/ -lv4l2 -lv4lconvert -ljpeg/" lib/libv4l1/libv4l1.pc
-sed -i "/^Libs: /s/ -lv4l2/ -lv4l2 -lv4lconvert -ljpeg/" lib/libv4l2/libv4l2.pc
-# Install libv4l into a temp directory so that vlc can pick it up later:
-make -C lib install LINKTYPE=static PREFIX=$VLCDEPSDIR/usr LIBDIR=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} SYSCONFDIR=$VLCDEPSDIR/etc 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_v4l.log
-# Add DOCS to the vlcdeps to have it added to vlc package later:
-mkdir -p $VLCDEPSDIR/doc/v4l-utils/
-cp COPYING* ChangeLog README* TODO $VLCDEPSDIR/doc/v4l-utils/ || true
-cd -
-}
-
-
-# -----------------------------------------------------------------------------
 # Compile libva
 # -----------------------------------------------------------------------------
 make_libva()
 {
 echo -e "**\n**  libva ...\n**"
-cd $TMP/tmp-$PRGNAM/libva-$(echo "$LIBVA" |cut -d- -f1)
+cd $TMP/tmp-$PRGNAM/libva-$LIBVA
 
 #
 # == NOTE ON VAAPI ==
@@ -3043,13 +3016,15 @@ cd $TMP/tmp-$PRGNAM/libva-$(echo "$LIBVA" |cut -d- -f1)
 # Ati hardware I can not build a package for xvba-video myself)
 #
 
-# Apply a wad of patches:
-for DPATCH in $(ls debian/patches/*.patch) ; do
-  cat $DPATCH |patch -p1 --verbose
-done 2>&1 | tee $OUTPUT/patch-${PRGNAM}_libva.log
-
-## Slackware uses a newer aclocal:
-autoreconf -vif
+#
+## Apply a wad of patches:
+#for DPATCH in $(ls debian/patches/*.patch) ; do
+#  cat $DPATCH |patch -p1 --verbose
+#done 2>&1 | tee $OUTPUT/patch-${PRGNAM}_libva.log
+#
+### Slackware uses a newer aclocal:
+#autoreconf -vif
+#
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -3060,6 +3035,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --enable-static \
   --enable-shared \
   --enable-glx \
+  --disable-wayland \
   --with-drivers-path=/usr/lib${LIBDIRSUFFIX}/va/drivers \
   --program-prefix= \
   --program-suffix= \
@@ -3080,7 +3056,7 @@ rm -f $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/libva*.la
 #  $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig/libva*.pc
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libva/
-cp COPYING $VLCDEPSDIR/doc/libva/  || true
+cp COPYING NEWS $VLCDEPSDIR/doc/libva/  || true
 cd -
 }
 
@@ -3289,7 +3265,7 @@ cd $TMP/tmp-$PRGNAM/${PRGNAM}-${SRCVER}
 echo "" >$OUTPUT/patch-${PRGNAM}.log
 
 # Configure a default Slackware TTF font:
-cat $SRCDIR/vlc-1.2_deffont.patch | patch -p1 --verbose \
+cat $SRCDIR/vlc-2.1_deffont.patch | patch -p1 --verbose \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 # Fix SDL header location:
@@ -3383,7 +3359,6 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
   --disable-zvbi \
   --disable-switcher \
   --enable-alsa \
-  --enable-oss \
   --enable-shared \
   --enable-optimize-memory=no \
   --enable-qt4 \
@@ -3477,6 +3452,8 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
   #--enable-v4l \
   #--enable-id3tag \
 
+  # VLC 2.1 wants OSS4 which we do not have:
+  #--enable-oss \
 
   # Now finds the required libraries without manual tweaking:
   #AVCODEC_LIBS="-lavcodec -lbz2 -lz ${DO_FFMPEG_LIBS_PAT} -ldl -ltheora -lvorbisenc -lswscale -lavutil -lvorbis -lm -logg" \
@@ -3762,7 +3739,6 @@ else
   make_kate
   make_tiger
   make_lua
-  make_v4l
   make_bluray
   make_opus