diff options
| author |   Eric Hameleers <alien@slackware.com> | 2014-01-20 22:32:33 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2014-01-20 22:32:33 +0000 |
| commit | 3720b1f5ee5985aa32391a7a4c2d90f7b5c122b5 (patch) | |
| tree | 049c11f5f4dbdc3368531660a7027f0956e803f7 /vlc | |
| parent | 248fca9ad0982bb9ee16502c1877793d60f00b40 (diff) | |
| download | asb-3720b1f5ee5985aa32391a7a4c2d90f7b5c122b5.tar.gz asb-3720b1f5ee5985aa32391a7a4c2d90f7b5c122b5.tar.xz | |
In preparation to 2.1.3, update the deps. Newer vlc, dvdread and dvdnav.
Revert libdvbpsi to 0.2.2 which is what VideoLAN devs use too. This may fix the stuttering video reported when streaming digital video
Diffstat (limited to 'vlc')
| -rwxr-xr-x | vlc/build/vlc.SlackBuild | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild index 46295651..bb15c8fd 100755 --- a/vlc/build/vlc.SlackBuild +++ b/vlc/build/vlc.SlackBuild @@ -376,11 +376,14 @@ # opus, speex, x264. # 2.1.2.-2 11/dec/2013 by Eric Hameleers <alien@slackware.com> # * Add VDPAU driver. -# 2.1.2.-2 13/dec/2013 by Eric Hameleers <alien@slackware.com> +# 2.1.2.-3 13/dec/2013 by Eric Hameleers <alien@slackware.com> # * Fixed the unexpectedly introduced external dependency on # shared libvdpau libraries - vlc will now work again # even if you do not have libvdpau installed. # Also, fixed the (long) broken rtmp support. +# 2.1.2.-4 20/jan/2013 by Eric Hameleers <alien@slackware.com> +# * Fixed stuttering video in digital video streams by reverting +# to an older libdvbpsi source. Updated the ffmpeg snapshot. # # Run 'sh vlc.SlackBuild' to build a Slackware package. # The package (.txz) plus descriptive .txt file are created in /tmp . @@ -404,7 +407,7 @@ PRGNAM=vlc PRGNAM2=npapi-vlc -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NPBUILD=${NPBUILD:-1} TAG=${TAG:-"alien"} @@ -538,14 +541,14 @@ DAAP=0.4.0 DC1394=2.2.1 DCA=0.0.5 DV=1.0.0 -DVBPSI=1.1.0 -DVDNAV=20140107 -DVDREAD=20140107 +DVBPSI=0.2.2 +DVDNAV=20140120 +DVDREAD=20140120 DVDCSS=1.2.13 EBML=1.3.0 FAAC=1.28 FAAD2=2.7 -FFMPEG=74a9c92 # git snapshot Sun, 29 Dec 2013 (11:37 +0100) +FFMPEG=ad8d063 # git snapshot Sun, 19 Jan 2014 17:30:22 +0100 (17:30 +0100) #FFMPEG=2.0.1 FLUID=1.1.6 FRIBIDI=0.19.6 @@ -1999,9 +2002,11 @@ else DO_CSS="" fi -sed -i -e "s#CSS_LIBS=-ldvdcss#CSS_LIBS=$VLCDEPSDIR/usr/lib$LIBDIRSUFFIX/libdvdcss.a -static#" \ - configure.ac - #-e 's#AC_CHECK_LIB(dvdcss,#AC_CHECK_LIB(,#' \ +# Remove offending line which does not get expanded by autoreconf: +sed -i -e '/CC_CHECK_CFLAGS_APPEND/d' configure.ac +# Fool it into not building apidocs and throwing errors as a result +# (sub-optimal code guys... why remove "--disable-apidocs"): +sed -i -e 's/\[doxygen\]/[doxygen_fubar]/' configure.ac if [ -x autogen.sh ]; then ./autogen.sh noconfig \ @@ -2015,6 +2020,7 @@ CFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \ CXXFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \ LDFLAGS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \ +CSS_LIBS="$VLCDEPSDIR/usr/lib$LIBDIRSUFFIX/libdvdcss.a -static" \ ./configure \ --prefix=$VLCDEPSDIR/usr \ --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \ @@ -2025,6 +2031,8 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \ ${DO_CSS} \ --build=$TARGET \ 2>&1 | tee -a $OUTPUT/configure-${PRGNAM}_dvdread.log +# Prevent documentation from being generated: +touch ChangeLog stamp-doxygen make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvdread.log # Install libdvdread into a temp location so libdvdnav can pickup the library echo -e "\n**\n**\n" |