diff options
author | Arwed v. Merkatz | 2007-02-19 20:23:24 +0100 |
---|---|---|
committer | Arwed v. Merkatz | 2007-02-22 21:14:22 +0100 |
commit | 640526aac9e9a7ba0eb65ac05eb8f3065194eb6f (patch) | |
tree | 14c87e8fc8da3f93f2232566a53a2263c5279e9b | |
parent | 703cd950c120d047373cbab6c54535db6138658a (diff) |
ffmpeg: updated to use a svn snapshot instead of the 2+ years old broken release
(cherry picked from commit f16a0fc01af5fc2ef13797dd91129bcff8725ac8)
-rwxr-xr-x | video/ffmpeg/BUILD | 22 | ||||
-rwxr-xr-x | video/ffmpeg/CONFLICTS | 2 | ||||
-rwxr-xr-x | video/ffmpeg/DEPENDS | 21 | ||||
-rwxr-xr-x | video/ffmpeg/DETAILS | 33 | ||||
-rw-r--r-- | video/ffmpeg/HISTORY | 7 | ||||
-rwxr-xr-x | video/ffmpeg/INSTALL | 24 | ||||
-rwxr-xr-x | video/ffmpeg/PREPARE | 1 | ||||
-rwxr-xr-x | video/ffmpeg/PRE_BUILD | 23 | ||||
-rw-r--r-- | video/ffmpeg/ffmpeg-0.4.9-pre1.tar.gz.sig | bin | 536 -> 0 bytes | |||
-rw-r--r-- | video/ffmpeg/gcc-3.4.patch | 19 |
10 files changed, 85 insertions, 67 deletions
diff --git a/video/ffmpeg/BUILD b/video/ffmpeg/BUILD index 55c83a46b9..e06d354804 100755 --- a/video/ffmpeg/BUILD +++ b/video/ffmpeg/BUILD @@ -1,23 +1,17 @@ -invoke_gcc -CFLAGS="${CFLAGS/-funroll-loops/}" +CFLAGS="${CFLAGS/-funroll-loops/} -O3" disable_pic && -if echo $CFLAGS | grep -q pentium4; then - CFLAGS="${CFLAGS/-O3/} -O2" -fi -patch -p1 < $SCRIPT_DIRECTORY/gcc-3.4.patch && +if [ $FFAMR != none ];then + OPTS="--enable-$FFAMR $OPTS" +fi && -sedit 's:-lpostproc:-Llibpostproc -lpostproc:' libavcodec/Makefile && ./configure --prefix=${INSTALL_ROOT}/usr \ --mandir=${INSTALL_ROOT}/usr/share/man \ --enable-shared \ + --enable-pthreads \ + --disable-static \ + --disable-debug \ --enable-pp \ - --enable-shared-pp \ --enable-gpl \ - --enable-a52 \ - $OPTS && -sedit 's:SDL_LIBS=.*:\0 -L/usr/X11R6/lib -lX11:' config.mak && -cd libavcodec/libpostproc && -make && -cd $SOURCE_DIRECTORY && + $OPTS && make diff --git a/video/ffmpeg/CONFLICTS b/video/ffmpeg/CONFLICTS index a933174abb..4178d22360 100755 --- a/video/ffmpeg/CONFLICTS +++ b/video/ffmpeg/CONFLICTS @@ -1,2 +1,2 @@ conflicts ffmpeg-cvs -conflicts ffmpeg y +conflicts ffmpeg-svn diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS index 001bb1b4bf..5e00480c92 100755 --- a/video/ffmpeg/DEPENDS +++ b/video/ffmpeg/DEPENDS @@ -1,28 +1,35 @@ -depends gcc34 && optional_depends "nasm" \ "" \ "--disable-mmx" \ "for MMX support" && optional_depends "lame" \ - "--enable-mp3lame" \ + "--enable-libmp3lame" \ "" \ "for mp3 encoding via libmp3lame" && optional_depends "libvorbis" \ - "--enable-vorbis" \ + "--enable-libogg --enable-libvorbis" \ "" \ "for ogg/vorbis support" && optional_depends "faad2" \ - "--enable-faad" \ + "--enable-libfaad" \ "" \ "for AAC audio support" && optional_depends "imlib2" \ "" \ "" \ "for imlib2 support" && -optional_depends "freetype2" \ - "" \ - "" \ +optional_depends "freetype2" \ + "" \ + "" \ "for a text render plugin" && +optional_depends "libdts" \ + "--enable-libdts" \ + "" \ + "for DTS audio decoding" && +optional_depends "xvid" \ + "--enable-xvid" \ + "" \ + "for xvid support" && optional_depends sdl \ "" \ "--disable-ffplay" \ diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS index 6b907fe88d..b134f75c00 100755 --- a/video/ffmpeg/DETAILS +++ b/video/ffmpeg/DETAILS @@ -1,14 +1,33 @@ SPELL=ffmpeg - VERSION=0.4.9-pre1 - SOURCE=$SPELL-$VERSION.tar.gz + VERSION=20070219 + SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL[0]=${SOURCEFORGE_URL}/ffmpeg/$SOURCE + SOURCE_URL[0]=http://download.sourcemage.org/distro/$SOURCE + SOURCE_HASH=sha512:8280b9b2f263912c9b68aea101929f59d3ad85edea76fda877c8e3d4f84b0768864d9f41e5a2cebf2efde5198ca69a4fd04db93927ce3fd4e3bb5100e5294ca2 +case $FFAMR in + none);; + *) +# amr_nb) + VERSION2=26104-610 + SOURCE2=$VERSION2.zip +SOURCE2_URL[0]=http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/$SOURCE2 + SOURCE2_HASH=sha512:2ab3c1be43b17b655674b93a17b3ebcf3b95a6483bf9c2177dc00dd2a2f2802cb6685e679982cb0edefce90bb854c7842be324d5f1bd17cf0d349f9c737c2d68 +# amr_nb-fixed) + VERSION3=26073-600 + SOURCE3=$VERSION3.zip +SOURCE3_URL[0]=http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/$SOURCE3 + SOURCE3_HASH=sha512:db9a7f5514d1a4a27062720f8ba5357f89cc6953c81b5b09defb37469e9a0b1195e9722d7b415152ad9642e1b1d7dddfd4e739bfc42b0c2fa6094d44faa50cde +# amr_wb) + VERSION4=26204-600 + SOURCE4=$VERSION4.zip +SOURCE4_URL[0]=http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/$SOURCE4 + SOURCE4_HASH=sha512:fe7c4a6cc669345d2857df7a056dc62b28d076afb06f3184f26deb2ebc6da5222be38e532b0cb5493b33b387bda39348f532fd02f16387ccd8564ea0e3f2c948 + ;; +esac WEB_SITE=http://ffmpeg.sourceforge.net - ENTERED=20020129 - UPDATED=20050906 - SOURCE_GPG="gurus.gpg:$SOURCE.sig" + ENTERED=20030514 LICENSE[0]=GPL - GCC_VERSION=3.4 + STAGED_INSTALL=off KEYWORDS="video" SHORT="ffmpeg is complete video and audio broadcasting solution" cat << EOF diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY index 2bf3c7093d..430c4f48fa 100644 --- a/video/ffmpeg/HISTORY +++ b/video/ffmpeg/HISTORY @@ -1,3 +1,10 @@ +2007-02-19 Arwed v. Merkatz <v.merkatz@gmx.net> + * BUILD, CONFLICTS, DEPENDS, DETAILS, INSTALL, PRE_BUILD, PREPARE: + changed spell to install a svn snapshot as there are no releases + anymore + updated all spell files with changes from the ffmpeg-svn spell + * gcc-3.4.patch: removed + 2006-09-21 Juuso Alasuutari <iuso@sourcemage.org> * PROVIDES: [automated] Fixed invalid entries. diff --git a/video/ffmpeg/INSTALL b/video/ffmpeg/INSTALL index 0ce2bdc2e9..ba4fac5ee3 100755 --- a/video/ffmpeg/INSTALL +++ b/video/ffmpeg/INSTALL @@ -1,19 +1,5 @@ -make install && -( - cd libavcodec/libpostproc && - make install && - install -m 644 postprocess_internal.h \ - ${INSTALL_ROOT}/usr/include/postproc -) && -( - install -m 644 libavcodec/bswap.h \ - ${INSTALL_ROOT}/usr/include/ffmpeg && - install -m 644 libavcodec/dsputil.h \ - ${INSTALL_ROOT}/usr/include/ffmpeg && - install -m 644 libavformat/os_support.h \ - ${INSTALL_ROOT}/usr/include/ffmpeg -) && - -if [ ! -f ${INSTALL_ROOT}/etc/ffserver.conf ] -then cp doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf -fi +make_single && +install_config_file doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf && +make install && +cp libavutil/bswap.h $INSTALL_ROOT/usr/include/ffmpeg && +cp libavformat/riff.h $INSTALL_ROOT/usr/include/ffmpeg diff --git a/video/ffmpeg/PREPARE b/video/ffmpeg/PREPARE new file mode 100755 index 0000000000..872a96e830 --- /dev/null +++ b/video/ffmpeg/PREPARE @@ -0,0 +1 @@ +config_query_list FFAMR "Include an AMR codec?" none amr_nb amr_nb-fixed amr_wb diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD new file mode 100755 index 0000000000..133962cd9c --- /dev/null +++ b/video/ffmpeg/PRE_BUILD @@ -0,0 +1,23 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +sedit 's:-lpostproc:-Llibpostproc -lpostproc:' libavcodec/Makefile && +sedit 's:-Werror::' libavformat/Makefile && + +message amr=$FFAMR && +cd libavcodec && +case $FFAMR in + none);; + *) +message amr_nb=$VERSION2 && + unpack_file 2 && + unzip ${VERSION2}*.zip && + mv c-code amr_float && +message amr_nb-fixed=$VERSION3 && + unpack_file 3 && + unzip ${VERSION3}*.zip && + mv c-code amr && +message amr_wb=$VERSION4 && + unpack_file 4 && + unzip ${VERSION4}*.zip && + mv c-code amrwb_float +esac diff --git a/video/ffmpeg/ffmpeg-0.4.9-pre1.tar.gz.sig b/video/ffmpeg/ffmpeg-0.4.9-pre1.tar.gz.sig Binary files differdeleted file mode 100644 index a1ab042abb..0000000000 --- a/video/ffmpeg/ffmpeg-0.4.9-pre1.tar.gz.sig +++ /dev/null diff --git a/video/ffmpeg/gcc-3.4.patch b/video/ffmpeg/gcc-3.4.patch deleted file mode 100644 index b33d529940..0000000000 --- a/video/ffmpeg/gcc-3.4.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nur ffmpeg-0.4.8/libavcodec/liba52/resample_mmx.c ffmpeg-0.4.8-fixed/libavcodec/liba52/resample_mmx.c ---- ffmpeg-0.4.8/libavcodec/liba52/resample_mmx.c 2003-09-28 17:26:40.000000000 +0200 -+++ ffmpeg-0.4.8-fixed/libavcodec/liba52/resample_mmx.c 2004-05-22 11:15:22.590433809 +0200 -@@ -7,10 +7,10 @@ - and it would mean (C / MMX2 / MMX / 3DNOW) versions - */ - --static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL; -+uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL; --static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL; -+uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL; --static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL; --static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL; -+uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL; -+uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL; - - static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){ - int32_t * f = (int32_t *) _f; - |