From d6a28b2945d53bb04a64c15ce27df34fba9be8dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrowski@alpinelinux.org>
Date: Mon, 24 Mar 2014 10:43:39 +0100
Subject: main/ffmpeg: upgrade to 2.2

---
 main/ffmpeg/APKBUILD | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD
index 70618ed34..5e6ddf051 100644
--- a/main/ffmpeg/APKBUILD
+++ b/main/ffmpeg/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ffmpeg
-pkgver=2.1.4
+pkgver=2.2
 pkgrel=0
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 url="http://ffmpeg.org/"
 arch="all"
 license="GPL"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-makedepends="lame-dev libvorbis-dev faac-dev xvidcore-dev zlib-dev
+makedepends="lame-dev libvorbis-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 yasm"
@@ -43,13 +43,11 @@ build() {
 		--enable-libmp3lame \
 		--enable-librtmp \
 		--enable-libvorbis \
-		--enable-libfaac \
 		--enable-libvpx \
 		--enable-libxvid \
 		--enable-libx264 \
 		--enable-libtheora \
 		--enable-libv4l2 \
-		--enable-nonfree \
 		--enable-postproc \
 		--enable-pic \
 		--enable-pthreads \
@@ -79,15 +77,15 @@ libs() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr
 }
 
-md5sums="dedc28003a77c69432c42ab16e5f6982  ffmpeg-2.1.4.tar.bz2
+md5sums="744febca199548c9393b1f1ed05ccdd8  ffmpeg-2.2.tar.bz2
 2cdc11a99bf97c63c7cca27b073cb47c  configure-dlvsym.patch
 fad4fc1e886146a4a2befc8fda052d50  fix-defines.patch
 2b6897f352583ee8efdc0c09ef27a30f  fix-libv4l2-errors.patch"
-sha256sums="7fb46cbd686830db192968e2f117744b1e9cd23f2fcf5ee63e6cbeaa089a8101  ffmpeg-2.1.4.tar.bz2
+sha256sums="1056fa971bf6bbe6f7990d60cc44bfd45667aaba94b09ef088937cd6d185f571  ffmpeg-2.2.tar.bz2
 0854db61ec784935d77516ba9a467ba61e118f951149c07acb6887a6b417ac55  configure-dlvsym.patch
 4ccac0cf75fe53685c4cdda4061f7248de9a9b98e11f8e3aed8e1822b94d35d1  fix-defines.patch
 872236e91e393b62a1a9d7aebdf0c417314f874a67cef55ad37b39ee57cf9edb  fix-libv4l2-errors.patch"
-sha512sums="37478730420be5d769b3c3ff743af6bb68406e20d86079d0e971334100801e41842881c53a2e307e3c0326019cb7b3402a847e5c67c20d305007b90c2973dd4f  ffmpeg-2.1.4.tar.bz2
+sha512sums="1956277fa0b4ef30a49a211c0fa3e90dc924f7d408ac559397f92b85f791b8c01da8eea1842f78a9a6378e07e1611df2f89c3d721aeb3629497b667579b6ebbf  ffmpeg-2.2.tar.bz2
 635c80ca801577439bd1cf8470fb760755c243e59adc8b4d9b8412f24e2dc336802afddde09f3d59443e29d92123d0308482be8ad32ab0f265c960315632636f  configure-dlvsym.patch
 ea2630d4ae5383bc24a322318aa8c41af745145755333660deec4ed256096eca73a49c41a0921544dfaa53d8087378cb2b5654001332c7262ea39f18e5c472c8  fix-defines.patch
 56bba30f200c748d47d60d2b18147522dbceec7e8c97f434d3dbfa239547113a3e9d3b280e22816adeafa994b22eefac4b968448afef1a07aa1c46d3ec359e68  fix-libv4l2-errors.patch"
-- 
cgit v1.2.3