summaryrefslogtreecommitdiffstats
path: root/ffmpeg/build
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2011-12-13 18:47:00 +0000
committer Eric Hameleers <alien@slackware.com>2011-12-13 18:47:00 +0000
commitdc39e5076e68d2d778a23ac1fb25db5e32a92a1d (patch)
treedd55360f9f9425ef65fc5672c13a2145ec7af728 /ffmpeg/build
parent77bd4231a7af4afddb1ac2ef2158978bd2f0f26a (diff)
downloadasb-dc39e5076e68d2d778a23ac1fb25db5e32a92a1d.tar.gz
asb-dc39e5076e68d2d778a23ac1fb25db5e32a92a1d.tar.xz
Update to 0.9
Diffstat (limited to 'ffmpeg/build')
-rwxr-xr-xffmpeg/build/ffmpeg.SlackBuild25
1 files changed, 14 insertions, 11 deletions
diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index 7298ea94..0ede0f43 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -114,6 +114,8 @@
# x264 libraries.
# 0.8.7-1: 22/nov/2011 by Eric Hameleers <alien@slackware.com>
# * New release.
+# 0.9-1: 13/dec/2011 by Eric Hameleers <alien@slackware.com>
+# * New release.
#
# Run 'sh ffmpeg.SlackBuild' to build a Slackware package.
# The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -140,7 +142,7 @@ USE_PATENTS=${USE_PATENTS:-"YES"}
USE_PATENTS=$(echo $USE_PATENTS | tr 'a-z' 'A-Z')
PRGNAM=ffmpeg
-VERSION=${VERSION:-0.8.7}
+VERSION=${VERSION:-0.9}
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j7}
TAG=${TAG:-"alien"}
@@ -176,7 +178,7 @@ DC1394=2.1.2
FAAC=1.28
FAAD2=2.7
GSM=1.0.13
-LAME=3.99.1
+LAME=3.99.3
LIBVA="0.32.0-1+sds2"
ORC=0.4.16
RAW1394=2.0.5
@@ -184,7 +186,7 @@ RTMP=2.3
SCHROEDINGER=1.0.10
SPEEX=1.2rc1
VPX=v0.9.7-p1
-X264=20111121-2245 # Needs yasm installed
+X264=20111212-2245 # Needs yasm installed
# Where do we look for sources?
SRCDIR=$(cd $(dirname $0); pwd)
@@ -1273,15 +1275,16 @@ cp -a ffpresets/*.ffpreset $PKG/usr/share/ffmpeg/
# against our ffmpeg will not get confused:
echo "** Fixing up pkgconfig files:"
for PCFILE in $(ls $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/*.pc) ; do
- sed -i -e 's/libraw1394//' -e 's/-lspeex//' -e 's/-lgsm//' \
- -e 's/-lopencore-amrnb//' -e 's/-lopencore-amrwb//' \
- -e 's/-lfaac//' -e 's/-lfaad//' \
- -e 's/-lvo-amrwbenc//' -e 's/-lvo-aacenc//' \
- -e 's/-lmp3lame//' -e 's/-lschroedinger-[^ ]*//' -e 's/-lorc-[^ ]*//' \
- -e 's/-lx264//' -e 's/-lvpx//' \
- -e 's/-lrtmp//' \
+ sed -i -e 's/-lraw1394//g' -e 's/-lavc1394//g' -e 's/-ldc1394//g' \
+ -e 's/-lspeex//g' -e 's/-lgsm//g' -e 's/-lrtmp//g' \
+ -e 's/-lopencore-amrnb//g' -e 's/-lopencore-amrwb//g' \
+ -e 's/-lfaac//g' -e 's/-lfaad//g' \
+ -e 's/-lvo-amrwbenc//g' -e 's/-lvo-aacenc//g' \
+ -e 's/-lmp3lame//g' \
+ -e 's/-lschroedinger-[^ ]*//g' -e 's/-lorc-[^ ]*//g' \
+ -e 's/-lx264//g' -e 's/-lvpx//g' \
-e "s#-L/tmp/build/tmp-ffmpeg/ffmpegdeps/usr/lib${LIBDIRSUFFIX}##" \
- -e 's/-ldc1394//' -e 's/-lraw1394//' $PCFILE
+ $PCFILE
done
# Add a configuration file for the ffserver: