From d59e820d3a0f3fdc073c4c96d9382c636be35e08 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 11 Jan 2010 21:36:52 +0100
Subject: [PATCH] ffmpeg: update to 20100108 snapshot, sanitize deps.

--HG--
extra : convert_revision : 6ba14f35912923cb71f78e9ffef1f29abbf57297
---
 srcpkgs/ffmpeg/ffmpeg-devel.template | 24 ++++++++++----
 srcpkgs/ffmpeg/template              | 49 ++++++++++++++++++++--------
 2 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/ffmpeg/ffmpeg-devel.template b/srcpkgs/ffmpeg/ffmpeg-devel.template
index 776f3e9027f..825f1c3a4ca 100644
--- a/srcpkgs/ffmpeg/ffmpeg-devel.template
+++ b/srcpkgs/ffmpeg/ffmpeg-devel.template
@@ -5,13 +5,23 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-_ffmpeg_deps="alsa-lib bzip2 faac faad2 freetype imlib2 lame libtheora"
-_ffmpeg_deps="${_ffmpeg_deps} libvorbis x264 xvidcore zlib SDL"
-_ffmpeg_deps="${_ffmpeg_deps} libX11 libXext"
-
-for _dep_ in ${_ffmpeg_deps}; do
-	Add_dependency run	${_dep_}-devel
-done
+Add_dependency run pkg-config
+Add_dependency run glibc-devel
+Add_dependency run SDL-devel
+Add_dependency run zlib-devel
+Add_dependency run faac-devel
+Add_dependency run faad2-devel
+Add_dependency run lame-devel
+Add_dependency run libtheora-devel
+Add_dependency run libvorbis-devel
+Add_dependency run x264-devel
+Add_dependency run xvidcore-devel
+Add_dependency run bzip2-devel
+Add_dependency run alsa-lib-devel
+Add_dependency run libX11-devel
+Add_dependency run libXext-devel
+Add_dependency run libXfixes-devel
+Add_dependency run ffmpeg
 
 do_install()
 {
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index ddec41f3f07..27b55ea34c3 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,17 +1,18 @@
 # Template file for 'ffmpeg'
 pkgname=ffmpeg
-version=0.5
-distfiles="http://ffmpeg.mplayerhq.hu/releases/ffmpeg-$version.tar.bz2"
+version=20100108
+wrksrc=$pkgname
+distfiles="ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${version}-21104.tar.bz2"
 build_style=configure
 configure_args="--prefix=/usr --enable-gpl --enable-libmp3lame
 --enable-libvorbis --enable-libfaac --enable-libfaad --enable-libxvid
 --enable-libx264 --enable-libtheora --enable-postproc --enable-shared
---enable-pthreads --enable-x11grab --enable-swscale"
+--enable-pthreads --enable-x11grab --enable-nonfree --enable-version3"
 make_build_args="doc/ffmpeg.1 doc/ffplay.1 doc/ffserver.1"
 make_install_args="install-man"
 short_desc="Decoding, encoding and streaming software"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
+checksum=545fd6d624c9063c2e0fcdf0801b6074c48f50cff2e6c9a47ef4ce43049556e6
 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
@@ -25,13 +26,35 @@ long_desc="
  simultaneously, faster than any other solution."
 
 subpackages="$pkgname-devel"
+
 Add_dependency run glibc
-
-_ffmpeg_deps="alsa-lib bzip2 faac faad2 freetype imlib2 lame libtheora"
-_ffmpeg_deps="${_ffmpeg_deps} libvorbis x264 xvidcore zlib SDL"
-_ffmpeg_deps="${_ffmpeg_deps} libX11 libXext"
-
-for _dep_ in ${_ffmpeg_deps}; do
-	Add_dependency run	${_dep_}
-	Add_dependency build	${_dep_}-devel
-done
+Add_dependency run SDL
+Add_dependency run zlib
+Add_dependency run faac
+Add_dependency run faad2
+Add_dependency run lame
+Add_dependency run libtheora
+Add_dependency run libvorbis
+Add_dependency run x264
+Add_dependency run xvidcore
+Add_dependency run bzip2
+Add_dependency run alsa-lib
+Add_dependency run libX11
+Add_dependency run libXext
+Add_dependency run libXfixes
+Add_dependency build pkg-config
+Add_dependency build glibc-devel
+Add_dependency build SDL-devel
+Add_dependency build zlib-devel
+Add_dependency build faac-devel
+Add_dependency build faad2-devel
+Add_dependency build lame-devel
+Add_dependency build libtheora-devel
+Add_dependency build libvorbis-devel
+Add_dependency build x264-devel
+Add_dependency build xvidcore-devel
+Add_dependency build bzip2-devel
+Add_dependency build alsa-lib-devel
+Add_dependency build libX11-devel
+Add_dependency build libXext-devel
+Add_dependency build libXfixes-devel