From e2eade16eccdde3e766c539e7923d77a4e67545a Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Mon, 29 Sep 2014 09:22:26 +0200
Subject: [PATCH] ffmpeg: update to 2.4.1 (soname bump)

---
 common/shlibs           | 16 ++++++++--------
 srcpkgs/ffmpeg/template | 27 ++++++++++++---------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 61e41a1062..eee7889711 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -382,14 +382,14 @@ libid3tag.so.0 libid3tag-0.15.1b_1
 libgif.so.6 giflib-5.0.1_1
 libImlib2.so.1 imlib2-1.4.2_1
 libmp3lame.so.0 lame-3.98.2_1
-libavdevice.so.55 libavdevice-2.1_1
-libavformat.so.55 libavformat-2.1_1
-libswscale.so.2 libswscale-0.8.6_1
-libswresample.so.0 libswresample-0.8.6_1
-libpostproc.so.52 libpostproc-0.8.6_1
-libavcodec.so.55 libavcodec-2.1_1
-libavutil.so.52 libavutil-1.2.1_1
-libavfilter.so.4 libavfilter-2.3_1
+libavdevice.so.56 libavdevice-2.4.1_1
+libavformat.so.56 libavformat-2.4.1_1
+libswscale.so.3 libswscale-2.4.1_1
+libswresample.so.1 libswresample-2.4.1_1
+libpostproc.so.53 libpostproc-2.4.1_1
+libavcodec.so.56 libavcodec-2.4.1_1
+libavutil.so.54 libavutil-2.4.1_1
+libavfilter.so.5 libavfilter-2.4.1_1
 libSDL-1.2.so.0 SDL-1.2.14_1
 libSDL_image-1.2.so.0 SDL_image-1.2.10_1
 libx264.so.136 x264-20131007_1
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 8c2894d60c..0df3af0f65 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,13 +1,13 @@
 # Template file for 'ffmpeg'
 pkgname=ffmpeg
-version=2.3.3
+version=2.4.1
 revision=1
 short_desc="Decoding, encoding and streaming software"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://www.ffmpeg.org"
 distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2"
-checksum=bb4c0d10a24e08fe67292690a1b4d4ded04f5c4c388f0656c98940ab0c606446
+checksum=b4aecfce2c41ea4a21320dad818aa9a365b09a9cafe0b7173359cba86683c7f3
 
 hostmakedepends="pkg-config perl yasm"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
@@ -24,20 +24,17 @@ do_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		i686*|x86_64*) _args="--enable-vdpau --enable-vaapi";;
 	esac
-        if [ "$CROSS_BUILD" ]; then
-                case "$XBPS_TARGET_MACHINE" in
-                        arm*) _arch="arm";;
-                        mips*) _arch="mips";;
-                        *) _arch="$XBPS_TARGET_MACHINE";;
-                esac
+	if [ "$CROSS_BUILD" ]; then
+		case "$XBPS_TARGET_MACHINE" in
+			arm*) _arch="arm";;
+			mips*) _arch="mips";;
+			*) _arch="$XBPS_TARGET_MACHINE";;
+		esac
 
-                _args+=" --enable-cross-compile
-                        --sysroot=$XBPS_CROSS_BASE
-                        --cross-prefix=${XBPS_CROSS_TRIPLET}-
-                        --target-os=linux --arch=${_arch}"
-
-		# Remove this pkg_config kludge, breaks cross build.
-		sed -e 's,$pkg_config --,pkg-config --,g' -i configure
+		_args+=" --enable-cross-compile
+			--sysroot=$XBPS_CROSS_BASE
+			--cross-prefix=${XBPS_CROSS_TRIPLET}-
+			--target-os=linux --arch=${_arch}"
 	fi
 
 	./configure --prefix=/usr --disable-debug --enable-gpl \