diff options
| author |   Eric Hameleers <alien@slackware.com> | 2011-10-07 13:15:01 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2011-10-07 13:15:01 +0000 |
| commit | 644660183c6b9486b90833be8d0876a4ba42b8da (patch) | |
| tree | d4a1dd09e0af21150e8099f1499cba7425502196 /ffmpeg | |
| parent | 175990740ba4c5ae3a15c4401f2e63b91ea48ded (diff) | |
| download | asb-644660183c6b9486b90833be8d0876a4ba42b8da.tar.gz asb-644660183c6b9486b90833be8d0876a4ba42b8da.tar.xz | |
Update to 0.8.5
Diffstat (limited to 'ffmpeg')
| -rwxr-xr-x | ffmpeg/build/ffmpeg.SlackBuild | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild index 55f0a4e8..b70bd259 100755 --- a/ffmpeg/build/ffmpeg.SlackBuild +++ b/ffmpeg/build/ffmpeg.SlackBuild @@ -105,6 +105,10 @@ # for Android by VisualOn: 'libvo-amrwnenc' and 'libvo-aacenc'. # And updated every built-in support library to their latest # version. +# 0.8.5-1: 07/oct/2011 by Eric Hameleers <alien@slackware.com> +# * New release. Also updated versions of internal vpx and x264 +# libraries. Fix the compilation in case the x264 libraries are +# already installed on the system. # # Run 'sh ffmpeg.SlackBuild' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -131,7 +135,7 @@ USE_PATENTS=${USE_PATENTS:-"YES"} USE_PATENTS=$(echo $USE_PATENTS | tr 'a-z' 'A-Z') PRGNAM=ffmpeg -VERSION=${VERSION:-0.8.2} +VERSION=${VERSION:-0.8.5} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} TAG=${TAG:-"alien"} @@ -172,8 +176,8 @@ RAW1394=2.0.5 RTMP=2.3 SCHROEDINGER=1.0.10 SPEEX=1.2rc1 -VPX=v0.9.7 -X264=20110810-2245 # Needs yasm installed +VPX=v0.9.7-p1 +X264=20111006-2245 # Needs yasm installed # Where do we look for sources? SRCDIR=$(cd $(dirname $0); pwd) @@ -922,7 +926,7 @@ fi cd $TMP/tmp-$PRGNAM/schroedinger-$SCHROEDINGER CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="$SLKLDFLAGS" \ +LDFLAGS="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \ PKG_CONFIG_PATH="$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \ ./configure \ --prefix=$FFMPEGDEPSDIR/usr \ @@ -1121,7 +1125,7 @@ sed -i -e "s/pkg_config --libs/pkg_config --static --libs/" \ TMPDIR="$TMP" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="$SLKLDFLAGS" \ +LDFLAGS="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \ PKG_CONFIG_PATH="$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \ ./configure \ --prefix=/usr \ |