diff options
| author |   Eric Hameleers <alien@slackware.com> | 2012-12-13 09:41:10 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2012-12-13 09:41:10 +0000 |
| commit | 8b9a258d3ae49b8f6951e2504ad8a55ccf8e71d1 (patch) | |
| tree | 7b8b194a17af1b899573dc6d0d1434dc684a095b /vlc | |
| parent | 6157c136274244a56c97904bef0d1a7fd5bcbe61 (diff) | |
| download | asb-8b9a258d3ae49b8f6951e2504ad8a55ccf8e71d1.tar.gz asb-8b9a258d3ae49b8f6951e2504ad8a55ccf8e71d1.tar.xz | |
Update to 2.0.5. The internal ffmpeg was reverted to the git snapshot of which VLC and MPlayer devs find it works better and causes less bugs
Diffstat (limited to 'vlc')
| -rwxr-xr-x | vlc/build/vlc.SlackBuild | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild index 4f982220..5b5bc15a 100755 --- a/vlc/build/vlc.SlackBuild +++ b/vlc/build/vlc.SlackBuild @@ -340,6 +340,10 @@ # 2.0.4-2 29/oct/2012 by Eric Hameleers <alien@slackware.com> # * Fix uPnP support by downgrading libupnp. Added opus encoder # support. Updated bluray, ffmpeg, vpx, x264 libraries. +# 2.0.5-1 12/dec/2012 by Eric Hameleers <alien@slackware.com> +# * Update. Rolled back the internal ffmpeg to snapshot r44967 +# (git 82db8ee) (pre-planar) until the bugs caused by FFmpeg's +# planar audio changes are fixed. # # Run 'sh vlc.SlackBuild' to build a Slackware package. # The package (.txz) plus descriptive .txt file are created in /tmp . @@ -363,7 +367,7 @@ PRGNAM=vlc PRGNAM2=npapi-vlc -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TAG=${TAG:-"alien"} PKGTYPE=${PKGTYPE:-"txz"} @@ -387,7 +391,7 @@ SLACKVER=$(cat /etc/slackware-version| cut -d' ' -f2) #VERSION=${VERSION:-"@1.1.0-bugfix#20120217"} #VERSION=${VERSION:-"master@git://git.videolan.org/vlc/vlc-2.0.git#20120217"} -VERSION=${VERSION:-"2.0.4"} +VERSION=${VERSION:-"2.0.5"} # At some point, the 1.2 development branched off the master tree: #DEFGITURI=${GITURI:-"git://git.videolan.org/vlc.git"} @@ -499,12 +503,12 @@ DV=1.0.0 DVBPSI=0.2.2 DVDNAV=4.2.0 DVDREAD=4.2.0 -DVDCSS=1.2.11 +DVDCSS=1.2.12 EBML=1.2.2 FAAC=1.28 FAAD2=2.7 -FFMPEG=1.0 -#FFMPEG=r25676 # 20101104 +#FFMPEG=1.0 +FFMPEG=82db8ee # git snapshot 20121029 FLUID=1.1.5 FRIBIDI=0.19.4 GGI=2.2.2 @@ -607,8 +611,9 @@ SRCPAT[0]="NO" USE[0]="YES" # ffmpeg libraries -SOURCE[1]="$SRCDIR/ffmpeg-${FFMPEG}.tar.bz2" -SRCURL[1]="http://ffmpeg.mplayerhq.hu/releases/ffmpeg-${FFMPEG}.tar.bz2" +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" #SRCURL[1]="" SRCPAT[1]="NO" USE[1]="YES" @@ -1470,6 +1475,13 @@ fi cd $TMP/tmp-$PRGNAM/ffmpeg-${FFMPEG} +# Apply stability patches: +touch $OUTPUT/patch-${PRGNAM}_ffmpeg.log +cat $SRCDIR/ffmpeg_libavcodec_a25d912.patch | patch -p1 --verbose \ + 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log +cat $SRCDIR/ffmpeg_swfdec.patch | patch -p1 --verbose \ + 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log + if [ "$ARCH" = "x86_64" ]; then ARCHOPTS="--arch=x86_64 --enable-pic" elif [ "$ARCH" = "armv7hl" ]; then |