diff options
Diffstat (limited to 'ffmpeg/build/ffmpeg.SlackBuild')
| -rwxr-xr-x | ffmpeg/build/ffmpeg.SlackBuild | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild index c71c9794..330f0f71 100755 --- a/ffmpeg/build/ffmpeg.SlackBuild +++ b/ffmpeg/build/ffmpeg.SlackBuild @@ -66,6 +66,10 @@ # * Updated to the 20081209 snapshot. Also updated x264 and lame # codecs, removed liba52 (because ffmpeg now has it's own native # implementation) and added speex codec. +# r16043-1: 10/dec/2008 by Eric Hameleers <alien@slackware.com> +# * Update. Also updated libraw1394 & libdc1394 to their 2.x +# versions and made small adaptations so that the script actually +# produces working binaries on x86_64 # # Run 'sh ffmpeg.SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -96,7 +100,7 @@ USE_PATENTS=${USE_PATENTS:-"YES"} REQUIRE_YASM=${REQUIRE_YASM:-"YES"} PRGNAM=ffmpeg -VERSION=${VERSION:-r16039} +VERSION=${VERSION:-r16043} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -120,14 +124,14 @@ DOCS_X264="AUTHORS COPYING" # Support libraries: AMRNB=7.0.0.2 AMRWB=7.0.0.3 -DC1394=1.2.2 +DC1394=2.0.2 FAAC=1.26 FAAD2=2.6.1 -FFMPEG=r16039 +FFMPEG=r16043 GSM=1.0.12 LAME=398-2 OIL=0.3.15 -RAW1394=1.3.0 +RAW1394=2.0.0 SCHROEDINGER=1.0.5 SPEEX=1.2rc1 X264_SAFE=20080301-2245 # In later versions nasm complains @@ -318,7 +322,7 @@ case "$ARCH" in SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; x86_64) SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" + SLKLDFLAGS="-L/usr/lib64 -fPIC"; LIBDIRSUFFIX="64" ;; athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer" SLKLDFLAGS=""; LIBDIRSUFFIX="" @@ -646,11 +650,18 @@ cd - make_x264() { echo -e "**\n** x264 ...\n**" +if [ "$ARCH" = "x86_64" ]; then + ARCHOPTS="--enable-pic" +else + ARCHOPTS="" +fi cd $TMP/tmp-$PRGNAM/x264-snapshot-${X264} CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="$SLKLDFLAGS" \ -./configure --prefix=/usr \ +./configure \ + --prefix=/usr \ + $ARCHOPTS \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}_x264.log make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x264.log # Install x264 into a temp location so ffmpeg can pickup the library @@ -672,9 +683,9 @@ GSMMAJ=$(echo $GSM | cut -d. -f1,2) GSMPL=$(echo $GSM | cut -d. -f3) mv $TMP/tmp-$PRGNAM/gsm-${GSMMAJ}-pl${GSMPL} $TMP/tmp-$PRGNAM/gsm-${GSM} cd $TMP/tmp-$PRGNAM/gsm-${GSM} -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="$SLKLDFLAGS" \ +# Without this, x86_64 builds will fail: +sed -i -e "/^CCFLAGS/s,-O2 ,$SLKCFLAGS ," \ + -e "s,^# LDFLAGS.*,LDFLAGS = $SLKLDFLAGS," Makefile make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_gsm.log # Install gsm into a temp location so ffmpeg can pickup the library make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_gsm.log |