From 57f0bbed16a6c1986923adbb2fab91b707628062 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 11 Aug 2011 23:19:08 +0200
Subject: [PATCH] ffmpeg: update to 0.7.3, enable VA-API support.

---
 srcpkgs/ffmpeg/libavcodec.template       |  1 +
 srcpkgs/ffmpeg/libavdevice.template      |  1 +
 srcpkgs/ffmpeg/libavfilter.template      | 17 +++++++++++++++++
 srcpkgs/ffmpeg/template                  | 18 +++++++++++++-----
 srcpkgs/libavfilter                      |  1 +
 xbps-src/common/mapping_shlib_binpkg.txt |  3 ++-
 6 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/ffmpeg/libavfilter.template
 create mode 120000 srcpkgs/libavfilter

diff --git a/srcpkgs/ffmpeg/libavcodec.template b/srcpkgs/ffmpeg/libavcodec.template
index e9f917b2b17..98ccf9c1033 100644
--- a/srcpkgs/ffmpeg/libavcodec.template
+++ b/srcpkgs/ffmpeg/libavcodec.template
@@ -16,6 +16,7 @@ Add_dependency run libvorbis
 Add_dependency run x264
 Add_dependency run xvidcore
 Add_dependency run libvpx
+Add_dependency run libva
 Add_dependency run libavutil
 
 do_install()
diff --git a/srcpkgs/ffmpeg/libavdevice.template b/srcpkgs/ffmpeg/libavdevice.template
index 0db561edc4b..d58232d4a1d 100644
--- a/srcpkgs/ffmpeg/libavdevice.template
+++ b/srcpkgs/ffmpeg/libavdevice.template
@@ -11,6 +11,7 @@ Add_dependency run alsa-lib
 Add_dependency run libX11
 Add_dependency run libXext
 Add_dependency run libXfixes
+Add_dependency run SDL
 Add_dependency run glibc
 
 do_install()
diff --git a/srcpkgs/ffmpeg/libavfilter.template b/srcpkgs/ffmpeg/libavfilter.template
new file mode 100644
index 00000000000..6c62bededfb
--- /dev/null
+++ b/srcpkgs/ffmpeg/libavfilter.template
@@ -0,0 +1,17 @@
+# Template file for 'libavfilter'.
+#
+short_desc="FFmpeg audio/video filter library"
+long_desc="
+ This is the audio/video filter library from FFmpeg."
+
+Add_dependency run glibc
+Add_dependency run libavformat
+Add_dependency run libavcodec
+Add_dependency run libswscale
+Add_dependency run libavutil
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libavfilter.so* ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index b98185b028b..b002f2d1ecb 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,11 +1,13 @@
 # Template file for 'ffmpeg'
 pkgname=ffmpeg
-version=0.6.3
-distfiles="http://ffmpeg.org/releases/ffmpeg-${version}.tar.bz2"
+version=0.7.3
+homepage="http://www.ffmpeg.org"
+distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2"
 build_style=custom-install
 short_desc="Decoding, encoding and streaming software"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=693867974a32f3dfe4131048d9ab97620710ff2eb82785462fba1f307493cf41
+license="GPL-3"
+checksum=58ee859d9c4f5c477ea5bd0dd8e6848ce3af8b6c0ffe3b556612d437e85abb17
 long_desc="
  FFmpeg is the first complete and free Internet Live Audio and Video
  Broadcasting solution. FFMpeg aims at being the command line tool to
@@ -18,7 +20,7 @@ long_desc="
  FFmpeg generates streaming files, in many popular formats
  simultaneously, faster than any other solution."
 
-subpackages="libavcodec libavdevice libavformat libavutil"
+subpackages="libavcodec libavdevice libavformat libavutil libavfilter"
 subpackages="${subpackages} libpostproc libswscale $pkgname-devel"
 
 Add_dependency run glibc
@@ -41,8 +43,10 @@ Add_dependency run xvidcore
 Add_dependency run libavdevice
 Add_dependency run libpostproc
 Add_dependency run libswscale
+Add_dependency run libavfilter
 Add_dependency run SDL
 Add_dependency run libvpx
+Add_dependency run libva
 
 Add_dependency build pkg-config
 Add_dependency build coreutils
@@ -63,8 +67,9 @@ Add_dependency build x264-devel
 Add_dependency build xvidcore-devel
 Add_dependency build SDL-devel
 Add_dependency build libvpx-devel
+Add_dependency build libva-devel
 
-do_build()
+do_configure()
 {
 	./configure \
 		--prefix=/usr \
@@ -87,7 +92,10 @@ do_build()
 		--enable-nonfree \
 		--enable-runtime-cpudetect \
 		--disable-debug  # libfaac is nonfree
+}
 
+do_build()
+{
 	sed -i -e "s|pod2man|/usr/lib/perl5/core_perl/bin/pod2man|g" Makefile
 	make ${makejobs}
 	make doc/ff{mpeg,play,server}.1
diff --git a/srcpkgs/libavfilter b/srcpkgs/libavfilter
new file mode 120000
index 00000000000..a9f1eea092d
--- /dev/null
+++ b/srcpkgs/libavfilter
@@ -0,0 +1 @@
+ffmpeg
\ No newline at end of file
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 20285d4bb6d..e6fce5b580e 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -358,9 +358,10 @@ libswscale.so			libswscale		ffmpeg-devel
 libpostproc.so.51		libpostproc		ffmpeg-devel
 libavcodec.so.52		libavcodec		ffmpeg-devel
 libavutil.so.50 		libavutil		ffmpeg-devel
+libavfilter.so			libavfilter		ffmpeg-devel
 libSDL-1.2.so			SDL			SDL-devel
 libSDL_image-1.2.so		SDL_image		SDL_image-devel
-libx264.so.93			x264			x264-devel
+libx264.so.115			x264			x264-devel
 libxvidcore.so			xvidcore		xvidcore-devel
 libtag.so			taglib			taglib-devel
 libfribidi.so			fribidi			fribidi-devel