diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2011-02-16 19:14:26 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2011-02-16 19:14:26 +0000 |
| commit | 71e39ce025e46b17e9634cb8fdeec7af04f2f0fa (patch) | |
| tree | ab6569d59ab7f79ae8cb7c677658f9ba12854069 /main/ffmpeg | |
| parent | 01fd4f6611dd2b61cd8ceee01b4a454d74bbbc51 (diff) | |
| parent | 692f71db5a7621fe29b255de3ef9ae973b74eacb (diff) | |
| download | aports-71e39ce025e46b17e9634cb8fdeec7af04f2f0fa.tar.bz2 aports-71e39ce025e46b17e9634cb8fdeec7af04f2f0fa.tar.xz | |
Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports-amanison
Conflicts:
main/iaxmodem/APKBUILD
Diffstat (limited to 'main/ffmpeg')
| -rw-r--r-- | main/ffmpeg/APKBUILD | 29 | ||||
| -rw-r--r-- | main/ffmpeg/pic.patch | 10 |
2 files changed, 22 insertions, 17 deletions
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index 840d01f6f2..481e403459 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -1,43 +1,48 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg -_svnrev=30526 -pkgver=0.5_svn$_svnrev -pkgrel=3 +pkgver=0.6.1 +pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.mplayerhq.hu/" +arch="x86 x86_64" license="GPL" subpackages="$pkgname-dev $pkgname-doc" makedepends="lame-dev libvorbis-dev faad2-dev faac-dev xvidcore-dev zlib-dev - imlib2-dev x264-dev libtheora-dev coreutils bzip2-dev perl" + imlib2-dev x264-dev libtheora-dev coreutils bzip2-dev perl libvpx-dev" depends= -source="ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-$_svnrev.tar.bz2 +source="http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 pic.patch" -_builddir="$srcdir"/$pkgname -build() { +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { cd "$_builddir" - patch -p1 < ../pic.patch || return 1 + patch -p1 -i "$srcdir"/pic.patch +} +build() { + cd "$_builddir" ./configure --prefix=/usr \ --enable-gpl \ --enable-libmp3lame \ --enable-libvorbis \ --enable-libfaac \ --enable-libfaad \ + --enable-libvpx \ --enable-libxvid \ --enable-libx264 \ --enable-libtheora \ --enable-nonfree \ --enable-postproc \ - --enable-shared \ + --enable-pic \ --enable-pthreads \ + --enable-shared \ --enable-x11grab \ --disable-mmx \ --disable-mmx2 \ --disable-stripping \ || return 1 make || return 1 - make tools/qt-faststart || return 1 + ${CC:-gcc} -o tools/qt-faststart $CFLAGS tools/qt-faststart.c || return 1 make doc/ffmpeg.1 doc/ffplay.1 doc/ffserver.1 || return 1 } @@ -47,5 +52,5 @@ package() { install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" || return 1 # strip --strip-debug "$pkgdir"/usr/lib/*.a || return 1 } -md5sums="36710a8fa2bb91556c355aeb0e662c81 ffmpeg-30526.tar.bz2 -3c5d446db8d512a3bca5f5a860bbcc04 pic.patch" +md5sums="4f5d732d25eedfb072251b5314ba2093 ffmpeg-0.6.1.tar.bz2 +d4870ae7350caed041d2b39e406a173b pic.patch" diff --git a/main/ffmpeg/pic.patch b/main/ffmpeg/pic.patch index 9651f31ef1..737e30ddeb 100644 --- a/main/ffmpeg/pic.patch +++ b/main/ffmpeg/pic.patch @@ -1,11 +1,11 @@ ---- a/libswscale/rgb2rgb.c 2009-07-10 14:27:39.000000000 +0000 -+++ b/libswscale/rgb2rgb.c 2009-07-10 14:53:45.000000000 +0000 -@@ -149,7 +149,7 @@ +--- ./libswscale/rgb2rgb.c.orig ++++ ./libswscale/rgb2rgb.c +@@ -159,7 +159,7 @@ #define RENAME(a) a ## _C #include "rgb2rgb_template.c" --#if ARCH_X86 && CONFIG_GPL -+#if ARCH_X86 && CONFIG_GPL && !defined(PIC) +-#if ARCH_X86 ++#if ARCH_X86 && !defined(PIC) //MMX versions #undef RENAME |