summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-06-17 12:39:58 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-06-17 12:43:40 +0000
commitbece277132bab24904f98da5d2ebad4a0cfc572c (patch)
treeb216f3568d29d4c7a041cc0c1ef132266e5c3124 /main
parent5e9ec9194376d0f0d2b440d23a8b86cd9d17652e (diff)
downloadaports-bece277132bab24904f98da5d2ebad4a0cfc572c.tar.bz2
aports-bece277132bab24904f98da5d2ebad4a0cfc572c.tar.xz
main/ffmpeg: upgrade to 0.6
with vp8 support
Diffstat (limited to 'main')
-rw-r--r--main/ffmpeg/APKBUILD26
-rw-r--r--main/ffmpeg/pic.patch10
2 files changed, 20 insertions, 16 deletions
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD
index 840d01f6f..6d1dcd4d5 100644
--- a/main/ffmpeg/APKBUILD
+++ b/main/ffmpeg/APKBUILD
@@ -1,36 +1,40 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ffmpeg
-_svnrev=30526
-pkgver=0.5_svn$_svnrev
-pkgrel=3
+pkgver=0.6
+pkgrel=0
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
url="http://ffmpeg.mplayerhq.hu/"
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 \
@@ -47,5 +51,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="d6142a9a5821d6a6262a6edb903faa24 ffmpeg-0.6.tar.bz2
+d4870ae7350caed041d2b39e406a173b pic.patch"
diff --git a/main/ffmpeg/pic.patch b/main/ffmpeg/pic.patch
index 9651f31ef..737e30dde 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