diff options
| author |   Eric Hameleers <alien@slackware.com> | 2012-02-18 19:25:27 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2012-02-18 19:25:27 +0000 |
| commit | 18043e520fdc19b47ed2ebfbca26d2c794b6a68f (patch) | |
| tree | 4f62e5bce73118f273e0e7428189f357498d5cb6 /vlc | |
| parent | bebd2a83c7d326320728a08bd7dfc39d2e4e1d96 (diff) | |
| download | asb-18043e520fdc19b47ed2ebfbca26d2c794b6a68f.tar.gz asb-18043e520fdc19b47ed2ebfbca26d2c794b6a68f.tar.xz | |
VLC source now in .xz format. Remove old x264 choice.
Diffstat (limited to 'vlc')
| -rwxr-xr-x | vlc/build/vlc.SlackBuild | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild index eda6b0c1..1f64979d 100755 --- a/vlc/build/vlc.SlackBuild +++ b/vlc/build/vlc.SlackBuild @@ -321,6 +321,9 @@ i!/bin/sh # * New release! Version 2.0 was originally named 1.2 but the # developers deciced that there were so many changes after 1.1.x # that a version bump to 2.0 would reflect this better. +# The set of internal libraries was again updated to their most +# recent versions. If you miss any library that I should add, +# let me know! # # Run 'sh vlc.SlackBuild' to build a Slackware package. # The package (.txz) plus descriptive .txt file are created in /tmp . @@ -506,9 +509,7 @@ UPNP=1.6.14 V4L=0.8.5 VCD=0.7.23 VPX=v1.0.0 -X264_SAFE=20080301-2245 # In later versions nasm complains - # about 'function hidden' -X264=20120216-2245 # Needs yasm installed +X264=20120216-2245 XUL=1.9.2.19 # Determine what X we're running (the modular X returns the prefix @@ -536,25 +537,6 @@ if [ "$MOZPLUGIN" == "YES" ]; then fi fi -# Check for yasm, use older x264 snapshot if not found: -if ! which yasm >/dev/null 2>&1 ; then - echo "+++" - echo "+++ The 'yasm' program does not seem to be installed." - echo "+++ The X264 codec compilation needs yasm (nasm will not do)" - if [ "$REQUIRE_YASM" != "YES" ]; then - X264=$X264_SAFE - echo "+++ Continuing the build anyway, but will use an older X264 ($X264)." - echo "+++" - else - echo "+++ Aborting the build - set the internal script variable:" - echo "+++ REQUIRE_YASM to 'NO' if you don't have yasm installed," - echo "+++ and want to fall back to an old (hopefully still useable)" - echo "+++ version of X264 that builds with nasm instead." - echo "+++" - exit 1 - fi -fi - # --------------------------------------------------------------------------- # Source tarballs and source URLs. # Sources which are not patented should have SRCPAT[n]="NO" @@ -590,9 +572,9 @@ else BRANCH="" GITURI="" SRCVER=$VERSION - SRCURL[0]="http://download.videolan.org/pub/videolan/${PRGNAM}/${SRCVER}/${PRGNAM}-${SRCVER}.tar.bz2" + SRCURL[0]="http://download.videolan.org/pub/videolan/${PRGNAM}/${SRCVER}/${PRGNAM}-${SRCVER}.tar.xz" fi -SOURCE[0]="$SRCDIR/${PRGNAM}-${SRCVER}.tar.bz2" +SOURCE[0]="$SRCDIR/${PRGNAM}-${SRCVER}.tar.xz" SRCPAT[0]="NO" USE[0]="YES" |