diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-03-20 08:50:24 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-03-20 08:50:24 +0200 |
| commit | 55ec8941e90926071278822329c3199fe2a82525 (patch) | |
| tree | 84437cd98a7a97b563b293f735afce0faac4b2c5 /main/ffmpeg | |
| parent | 4d3e6a3db23e4f72cd580f2931c5ee1aab6dbf79 (diff) | |
| download | aports-55ec8941e90926071278822329c3199fe2a82525.tar.bz2 aports-55ec8941e90926071278822329c3199fe2a82525.tar.xz | |
main/ffmpeg: upgrade to 1.1.4 and enable asm for non-x86
fixes #1631
Diffstat (limited to 'main/ffmpeg')
| -rw-r--r-- | main/ffmpeg/APKBUILD | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index 33f5918fbd..e547052e7d 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=0 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.org/" @@ -10,7 +10,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" makedepends="lame-dev libvorbis-dev faac-dev xvidcore-dev zlib-dev imlib2-dev x264-dev libtheora-dev coreutils bzip2-dev perl libvpx-dev libvpx-dev sdl-dev libxfixes-dev libva-dev alsa-lib-dev rtmpdump-dev - v4l-utils-dev" + v4l-utils-dev yasm" depends= source="http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 configure-dlvsym.patch" @@ -27,7 +27,9 @@ prepare() { build() { local _dbg="--disable-debug" + local _asm="" [ -n "$DEBUG" ] && _dbg="--enable-debug" + [ "$CARCH" = "x86" ] && _asm="--disable-asm" cd "$_builddir" ./configure --prefix=/usr \ --enable-gpl \ @@ -46,11 +48,10 @@ build() { --enable-pthreads \ --enable-shared \ --enable-x11grab \ - --disable-asm \ --disable-stripping \ --disable-static \ --enable-vaapi \ - $_dbg \ + $_asm $_dbg \ || return 1 make || return 1 ${CC:-gcc} -o tools/qt-faststart $CFLAGS tools/qt-faststart.c || return 1 @@ -71,9 +72,9 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } -md5sums="f66eee18559ba59da63b895164a189c3 ffmpeg-1.1.3.tar.bz2 +md5sums="4cf902c2859ffe2203465af3622f5ac9 ffmpeg-1.1.4.tar.bz2 2cdc11a99bf97c63c7cca27b073cb47c configure-dlvsym.patch" -sha256sums="a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8 ffmpeg-1.1.3.tar.bz2 +sha256sums="252c00bd781f08a3542795b8f111b131f4afe93f1c486a4884306d27823aef6d ffmpeg-1.1.4.tar.bz2 0854db61ec784935d77516ba9a467ba61e118f951149c07acb6887a6b417ac55 configure-dlvsym.patch" -sha512sums="56a4f1b77f55521e2e129155b10024d02a919b8429a24ef2103b2242e2782695e05e032bffa65b3a90326bee0c274dba5869d0cfbba3f13c11c0ae328ba4ef26 ffmpeg-1.1.3.tar.bz2 +sha512sums="ad4ae8703fa0dfd6ec7ac7b45b0d2d3c4df544b56565932fed4f9b620c650f1762572b587a0c47eb1bb66c96a7e8c1374ac4ae0f6dfaf355ea8701c408e2c105 ffmpeg-1.1.4.tar.bz2 635c80ca801577439bd1cf8470fb760755c243e59adc8b4d9b8412f24e2dc336802afddde09f3d59443e29d92123d0308482be8ad32ab0f265c960315632636f configure-dlvsym.patch" |