[gentoo-commits] dev/dev-zero:master commit in: media-libs/libvalhalla/, media-libs/libplayer/, media-libs/libvalhalla/files/, ...

[Tiziano Müller]

commit:     dbbeb8ee10505286572dd83094e862a95784aea2
Author:     Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Mon Nov 21 06:09:22 2011 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 06:24:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=dbbeb8ee

Version bump, dropped old.

---
 dev-libs/libnfo/Manifest                           |    4 +-
 .../{libnfo-1.0.0.ebuild => libnfo-1.0.1.ebuild}   |   14 +--
 media-libs/libplayer/Manifest                      |    7 +-
 media-libs/libplayer/files/1.0.0-configure.patch   |   12 ---
 media-libs/libplayer/libplayer-1.0.0.ebuild        |   85 ------------------
 ...0_pre20100821.ebuild => libplayer-2.0.1.ebuild} |   14 ++--
 media-libs/libvalhalla/Manifest                    |    9 +-
 .../files/2.0.0-curl-fixes-f90b201e130c.patch      |   25 ++++++
 .../files/2.0.0-libav-fixes-70494a8fd3f5.patch     |   76 ++++++++++++++++
 .../files/2.0.0-libav-fixes-804a298afa60.patch     |   91 ++++++++++++++++++++
 media-libs/libvalhalla/libvalhalla-1.0.1.ebuild    |   79 -----------------
 ...pre20100821.ebuild => libvalhalla-2.0.0.ebuild} |   34 ++++----
 12 files changed, 229 insertions(+), 221 deletions(-)

diff --git a/dev-libs/libnfo/Manifest b/dev-libs/libnfo/Manifest
index 356d705..541f6fd 100644
--- a/dev-libs/libnfo/Manifest
+++ b/dev-libs/libnfo/Manifest
@@ -1,2 +1,2 @@
-EBUILD libnfo-1.0.0.ebuild 1018 RMD160 92339646729f0523213c91bab1bbafa71d1c93c1 SHA1 5ef169755023e6d59cba1c60f6aed1e346ffd9f1 SHA256 52cc2c3f668b91623f7e5a84750c4d0372d452ed9d46e423dcbe96beb6a88a71
-DIST libnfo-1.0.0.tar.bz2 41400 RMD160 05ef0f59a9110ee22c95116c56c2cf60ccab973d SHA1 13a041b61a34f3ccabc505d737cba963a3ce935c SHA256 d9c4d4d681c05a0f9ca4adfb5a8f8ef7e753d757b26b3a3227f8277439d760d9
+DIST libnfo-1.0.1.tar.bz2 44019 RMD160 5b0c7c02e9502f77871f8a1de067904d722d8e77 SHA1 38c79fce647b0ae33623b99cd6df56ffaa3e0371 SHA256 36883e649668c430b0ab5193cbe6a5f161e9d8b22fd17c28a43c08674acd0b25
+EBUILD libnfo-1.0.1.ebuild 951 RMD160 3d72e468b1e04d41969508249c44178f97d167ed SHA1 28629465e1a1d467b74c84ebea5834d48f9536cc SHA256 e9c4e3ad1371c5ded3f2974e55d820e5f0ac01ddd176bcf5a6494d974cf5c280

diff --git a/dev-libs/libnfo/libnfo-1.0.0.ebuild b/dev-libs/libnfo/libnfo-1.0.1.ebuild
similarity index 83%
rename from dev-libs/libnfo/libnfo-1.0.0.ebuild
rename to dev-libs/libnfo/libnfo-1.0.1.ebuild
index 57ae8c6..725b9b4 100644
--- a/dev-libs/libnfo/libnfo-1.0.0.ebuild
+++ b/dev-libs/libnfo/libnfo-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Tiziano Müller
+# Copyright 1999-2011 Tiziano Müller
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
 inherit multilib
 
@@ -13,7 +13,7 @@ SRC_URI="http://libnfo.geexbox.org/releases/${P}.tar.bz2"
 LICENSE="LPGL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="doc static-libs"
+IUSE="debug doc static-libs"
 
 RDEPEND="dev-libs/libxml2"
 DEPEND="${RDEPEND}
@@ -26,6 +26,7 @@ src_prepare() {
 		-e 's|: $(BUILD_RULES)|:|' \
 		src/Makefile || die "sed failed"
 
+	# fix html docs install path
 	sed -i \
 		-e "s|/libnfo|/${PF}/html|" \
 		DOCS/Makefile || die "sed failed"
@@ -42,10 +43,3 @@ src_configure() {
 		--disable-optimize \
 		$(use_enable doc)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS README
-}
-

diff --git a/media-libs/libplayer/Manifest b/media-libs/libplayer/Manifest
index 3ed8dc1..d33623e 100644
--- a/media-libs/libplayer/Manifest
+++ b/media-libs/libplayer/Manifest
@@ -1,5 +1,2 @@
-AUX 1.0.0-configure.patch 458 RMD160 9d28e11632b0a8c87e1adee4378fd338b8279f32 SHA1 2d1f0f86a70aa5d3a55607350bc577d716f75b83 SHA256 55f84420eb80dda0d04e3831af97fd78f5d96cc56de627cef7068c41c28031a0
-EBUILD libplayer-1.0.0.ebuild 1998 RMD160 7101764fc812583bf879678e01c505783a973bd3 SHA1 087075ee19a73cebdf89966544f505138c440079 SHA256 b8ed830da8fa654502d4dcd70adbaa2726e3f5469f59251c00901c8bf01a44aa
-EBUILD libplayer-2.0.0_pre20100821.ebuild 1971 RMD160 21167fd2a9ae6f6bca5b50a272cbda3bd73681fb SHA1 02a43e0517499fad9df7d418fb026e509589f0d6 SHA256 aed48664f615bb6cf7054208b2fb82fc3ee5cefa307d6fec3c81fc5d014b91ff
-DIST libplayer-2.0.0_pre20100821.tbz2 1283789 RMD160 8e63183b9659e967dc595b604072861c1e0ee1ac SHA1 bb5d6de758bf92b9f071fc15e02ca6c7f3a68124 SHA256 f778820814f8cc8fc6b5dcb3a5253c27328e0b873aa0392f16195a6ef913a257
-DIST libplayer-1.0.0.tar.bz2 1021245 RMD160 2e167935725c636c20fd8ec8c7e281eb27cd3131 SHA1 8c4b978e9274b389887c5e663b25d9733b7d4e33 SHA256 a21096c6f3d1084cb436012d382876dd17d69c8a539352da30a48b5ec2ff00db
+DIST libplayer-2.0.1.tar.bz2 1073367 RMD160 9adbe89de98aa9c8605381f44d3d6bc70afe7316 SHA1 e24dc7d029f955d754c712b2b60381f40bbc3ff4 SHA256 aa5eeb54f773bc9cad2733e4a0b5870208fc7f75024515ea87e55f64653e9d65
+EBUILD libplayer-2.0.1.ebuild 2003 RMD160 6baac9d660494db03f8c5ee467211df53f395919 SHA1 96ced6b3982daf5958aafa9c3f630703e4e8e3ef SHA256 4b30f3895b78a1066d74b120960ae25f9ac9e38bf221b9a8a93e6922f978095c

diff --git a/media-libs/libplayer/files/1.0.0-configure.patch b/media-libs/libplayer/files/1.0.0-configure.patch
deleted file mode 100644
index c4f4490..0000000
--- a/media-libs/libplayer/files/1.0.0-configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	2010-01-10 20:08:43.174153274 +0100
-+++ configure	2010-01-10 20:10:31.044146132 +0100
-@@ -813,8 +813,8 @@
- #   check for libX11
- #################################################
- if test "$x11" = "auto" -o "$x11" = "yes"; then
-+  x11="no"
-   if test "$wrapper_xine" = "yes" -o "$wrapper_mplayer" = "yes"; then
--    x11="no"
-     echolog "Checking for libX11 ..."
-     if [ -n "$libX11dir" ]; then
-       check_cflags -I$libX11dir/include

diff --git a/media-libs/libplayer/libplayer-1.0.0.ebuild b/media-libs/libplayer/libplayer-1.0.0.ebuild
deleted file mode 100644
index 7477885..0000000
--- a/media-libs/libplayer/libplayer-1.0.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2010 Tiziano Müller
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit confutils eutils python
-
-DESCRIPTION="Multimedia A/V abstraction layer API."
-HOMEPAGE="http://libplayer.geexbox.org/"
-SRC_URI="http://libplayer.geexbox.org/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug doc examples gstreamer mplayer python static-libs vlc xine +X"
-
-CDEPEND="gstreamer? ( media-libs/gstreamer )
-	python? ( dev-lang/python )
-	vlc? ( media-video/vlc )
-	xine? ( media-libs/xine-lib )
-	X? ( x11-libs/libX11 )"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	mplayer? ( media-video/mplayer )"
-
-pkg_setup() {
-	confutils_require_any gstreamer mplayer vlc xine
-	if use X ; then
-		ewarn "Please note that disabling X support makes"
-		ewarn "libplayer not use any video output with xine or mplayer."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-configure.patch"
-	
-	# avoid installing test-progs and building in src_install
-	sed -i \
-		-e 's|install-test ||' \
-		Makefile || die "sed failed"
-
-	# avoid unnecessary relinking and parallel build problem in src_install
-	sed -i \
-		-e 's|: $(BUILD_RULES)|:|' \
-		src/Makefile || die "sed failed"
-
-	sed -i \
-		-e "s|/libplayer|/${PF}/html|" \
-		DOCS/Makefile || die "sed failed"
-}
-
-src_configure() {
-	# no autoconf
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable debug) \
-		--disable-optimize \
-		--disable-strip \
-		$(use_enable static-libs static) \
-		$(use_enable doc) \
-		$(use_enable gstreamer) \
-		$(use_enable mplayer) \
-		$(use_enable python binding-python) \
-		$(use_enable vlc) \
-		$(use_enable xine) \
-		$(use_enable X x11)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog README DOCS/*.txt
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r libplayer-*.c samples
-	fi
-
-	use python && python_need_rebuild
-}
-

diff --git a/media-libs/libplayer/libplayer-2.0.0_pre20100821.ebuild b/media-libs/libplayer/libplayer-2.0.1.ebuild
similarity index 85%
rename from media-libs/libplayer/libplayer-2.0.0_pre20100821.ebuild
rename to media-libs/libplayer/libplayer-2.0.1.ebuild
index f671721..c2c781d 100644
--- a/media-libs/libplayer/libplayer-2.0.0_pre20100821.ebuild
+++ b/media-libs/libplayer/libplayer-2.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 PYTHON_DEPEND="python? 2"
 
@@ -10,18 +10,20 @@ inherit confutils python
 
 DESCRIPTION="Multimedia A/V abstraction layer API."
 HOMEPAGE="http://libplayer.geexbox.org/"
-SRC_URI="http://dev-zero.ch/gentoo/distfiles/${P}.tbz2"
+SRC_URI="http://libplayer.geexbox.org/releases/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug doc examples gstreamer mplayer python static-libs vdpau vlc xine +X"
+IUSE="debug doc examples gstreamer mplayer python static-libs -vdpau vlc xine +X"
 
-CDEPEND="gstreamer? ( media-libs/gstreamer )
-	vdpau? ( x11-libs/libvdpau x11-libs/vdpau-video )
+CDEPEND="X? ( x11-libs/libxcb )
+	gstreamer? ( media-libs/gstreamer )
+	python? ( dev-lang/python )
 	vlc? ( media-video/vlc )
 	xine? ( media-libs/xine-lib )
-	X? ( x11-libs/libX11 )"
+	vdpau? ( x11-libs/libX11
+		x11-libs/libvdpau )"
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )"

diff --git a/media-libs/libvalhalla/Manifest b/media-libs/libvalhalla/Manifest
index fc6ecf8..a69de32 100644
--- a/media-libs/libvalhalla/Manifest
+++ b/media-libs/libvalhalla/Manifest
@@ -1,4 +1,5 @@
-EBUILD libvalhalla-1.0.1.ebuild 1960 RMD160 a6142dcf86903e6998fdbae09fab75e52e5ad893 SHA1 5f80d303f1977c62aa7267ba8c8bd43ec2ef47c4 SHA256 9d18defa7d7044891a79ea7b01e5504e4b8c937149c1c5bbd4e323d0c84131b4
-EBUILD libvalhalla-2.0.0_pre20100821.ebuild 1967 RMD160 e8d66691928ec921ebd92b9632f991d3e1e70ea8 SHA1 0de2dc85201eba3235d5c47cdd0b03ff9f8dc81b SHA256 7d23c6df452792b503c3cf424db71c7325f55c17b3bfcc4984641406a43f2088
-DIST libvalhalla-2.0.0_pre20100821.tbz2 631663 RMD160 079c833bc5955268d5c01901a2f7a6439895eecf SHA1 fccc155c3c6336c98bb742b08c4524673712c2ff SHA256 4910c2e3aecc79be89fcfa506100c5449373df9a5b6340de07e9540c260ec087
-DIST libvalhalla-1.0.1.tar.bz2 309057 RMD160 4721061fb55726a29bb3ada30a3d2dd293b2a15b SHA1 07eea3135c4682bdc52384e30afec06c3d77a546 SHA256 df78015e118c784e3ff3e8562bc96d287ac11997d3b9e45e2d8b67568b0600d3
+AUX 2.0.0-curl-fixes-f90b201e130c.patch 711 RMD160 9446e037b4f9d225298c1fe0e1873faf186e8bc9 SHA1 0b850110ddffce987b95ead2570026a8a6d5babf SHA256 370b311b04294baba125639b501ccefe561ab292980a7aa5910e8cfe103e5170
+AUX 2.0.0-libav-fixes-70494a8fd3f5.patch 2132 RMD160 70061cac50aa5eb1bbdb0a352770bdd33fc0044a SHA1 aa4c0371f2a58c3875573ae28e17dd095332e6b8 SHA256 599a7338e05b5e0e6ca2671420e3e4b83984aea2dba5997f4bf98113ece1eaa5
+AUX 2.0.0-libav-fixes-804a298afa60.patch 2826 RMD160 1de804d168f696b36bc544f64bff34deb691c23c SHA1 ae14a442304cb29fb4ac0ca981af8cc6e1606807 SHA256 f18c5bb65b71eb9ec02514995748637e4d0172c70144c9de2eb657f59adaeb65
+DIST libvalhalla-2.0.0.tar.bz2 420027 RMD160 9cf85cc5273517b764739d250582e5c5c1d1a172 SHA1 d26965e37926493108f2599a93eb5d953b8cae26 SHA256 76c6a60eec2b463e6750179cfc59f60eebc853ec2956344ce0ce5c775cbf452f
+EBUILD libvalhalla-2.0.0.ebuild 1991 RMD160 64411bf89a746327fbca038bc84215d596550b47 SHA1 63b4c90fa6de72f6a180f85a070e379e0d6f6587 SHA256 ed9e3add0c795bdbcfe2252f539508fc020444761fdd36307430eea23ec4a7c1

diff --git a/media-libs/libvalhalla/files/2.0.0-curl-fixes-f90b201e130c.patch b/media-libs/libvalhalla/files/2.0.0-curl-fixes-f90b201e130c.patch
new file mode 100644
index 0000000..2621e50
--- /dev/null
+++ b/media-libs/libvalhalla/files/2.0.0-curl-fixes-f90b201e130c.patch
@@ -0,0 +1,25 @@
+
+# HG changeset patch
+# User Davide Cavalca <davide@×××××××.org>
+# Date 1313305279 -7200
+# Node ID f90b201e130c86484380286d4ce08766bf48365c
+# Parent  9a2d018e76899fcf3bfa8b18ba73b25799ffeed5
+drop deprecated curl includes
+
+curl/types.h has been removed in recent curl versions. Refer to
+https://github.com/bagder/curl/commit/ac28971aa61d28e5dd54888e34e958d1c742b461
+for details.
+
+diff -r 9a2d018e7689 -r f90b201e130c src/url_utils.c
+--- a/src/url_utils.c	Mon Aug 08 18:07:40 2011 +0200
++++ b/src/url_utils.c	Sun Aug 14 09:01:19 2011 +0200
+@@ -26,8 +26,6 @@
+ #include <unistd.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+-#include <curl/easy.h>
+ 
+ #include "valhalla.h"
+ #include "valhalla_internals.h"
+

diff --git a/media-libs/libvalhalla/files/2.0.0-libav-fixes-70494a8fd3f5.patch b/media-libs/libvalhalla/files/2.0.0-libav-fixes-70494a8fd3f5.patch
new file mode 100644
index 0000000..cdca7d8
--- /dev/null
+++ b/media-libs/libvalhalla/files/2.0.0-libav-fixes-70494a8fd3f5.patch
@@ -0,0 +1,76 @@
+
+# HG changeset patch
+# User Davide Cavalca <davide@×××××××.org>
+# Date 1313566462 -7200
+# Node ID 70494a8fd3f563a4c026e60d5b7344bb572b3797
+# Parent  f90b201e130c86484380286d4ce08766bf48365c
+fix build with libav 0.7 (patch by Fabrice Coutadeur <fabricesp at ubuntu dot com>)
+
+diff -r f90b201e130c -r 70494a8fd3f5 src/grabber_ffmpeg.c
+--- a/src/grabber_ffmpeg.c	Sun Aug 14 09:01:19 2011 +0200
++++ b/src/grabber_ffmpeg.c	Wed Aug 17 09:34:22 2011 +0200
+@@ -89,7 +89,11 @@
+ 
+     switch (codec->codec_type)
+     {
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++    case AVMEDIA_TYPE_AUDIO:
++#else
+     case CODEC_TYPE_AUDIO:
++#endif
+       audio_streams++;
+       name = grabber_ffmpeg_codec_name (codec->codec_id);
+       if (name)
+@@ -103,7 +107,11 @@
+                               VALHALLA_METADATA_AUDIO_BITRATE, ffmpeg->pl);
+       break;
+ 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++    case AVMEDIA_TYPE_VIDEO:
++#else
+     case CODEC_TYPE_VIDEO:
++#endif
+       /* Common part (image + video) */
+       video_streams++;
+       name = grabber_ffmpeg_codec_name (codec->codec_id);
+@@ -138,7 +146,11 @@
+                             VALHALLA_METADATA_VIDEO_ASPECT, ffmpeg->pl);
+       break;
+ 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++    case AVMEDIA_TYPE_SUBTITLE:
++#else
+     case CODEC_TYPE_SUBTITLE:
++#endif
+       sub_streams++;
+       break;
+ 
+diff -r f90b201e130c -r 70494a8fd3f5 src/parser.c
+--- a/src/parser.c	Sun Aug 14 09:01:19 2011 +0200
++++ b/src/parser.c	Wed Aug 17 09:34:22 2011 +0200
+@@ -343,10 +343,21 @@
+   for (i = 0; i < ctx->nb_streams; i++)
+   {
+     AVStream *st = ctx->streams[i];
+-
+-    if (st->codec->codec_type == CODEC_TYPE_VIDEO)
++    if (st->codec->codec_type ==
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++    AVMEDIA_TYPE_VIDEO
++#else
++    CODEC_TYPE_VIDEO
++#endif
++    )
+       video_st = 1;
+-    else if (st->codec->codec_type == CODEC_TYPE_AUDIO)
++    else if (st->codec->codec_type ==
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
++    AVMEDIA_TYPE_AUDIO
++#else
++    CODEC_TYPE_AUDIO
++#endif
++    )
+       audio_st = 1;
+   }
+ 
+

diff --git a/media-libs/libvalhalla/files/2.0.0-libav-fixes-804a298afa60.patch b/media-libs/libvalhalla/files/2.0.0-libav-fixes-804a298afa60.patch
new file mode 100644
index 0000000..609aacb
--- /dev/null
+++ b/media-libs/libvalhalla/files/2.0.0-libav-fixes-804a298afa60.patch
@@ -0,0 +1,91 @@
+
+# HG changeset patch
+# User Mathieu Schroeter <mathieu.schroeter@×××××××.ch>
+# Date 1314609729 -7200
+# Node ID 804a298afa60f18558db4c87b8027a535b594650
+# Parent  70494a8fd3f563a4c026e60d5b7344bb572b3797
+ffmpeg: use only AVMEDIA_ instead of CODEC_ in the implementation files; prefer a define for the older versions of ffmpeg
+
+diff -r 70494a8fd3f5 -r 804a298afa60 src/grabber_ffmpeg.c
+--- a/src/grabber_ffmpeg.c	Wed Aug 17 09:34:22 2011 +0200
++++ b/src/grabber_ffmpeg.c	Mon Aug 29 11:22:09 2011 +0200
+@@ -89,11 +89,7 @@
+ 
+     switch (codec->codec_type)
+     {
+-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+     case AVMEDIA_TYPE_AUDIO:
+-#else
+-    case CODEC_TYPE_AUDIO:
+-#endif
+       audio_streams++;
+       name = grabber_ffmpeg_codec_name (codec->codec_id);
+       if (name)
+@@ -107,11 +103,7 @@
+                               VALHALLA_METADATA_AUDIO_BITRATE, ffmpeg->pl);
+       break;
+ 
+-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+     case AVMEDIA_TYPE_VIDEO:
+-#else
+-    case CODEC_TYPE_VIDEO:
+-#endif
+       /* Common part (image + video) */
+       video_streams++;
+       name = grabber_ffmpeg_codec_name (codec->codec_id);
+@@ -146,11 +138,7 @@
+                             VALHALLA_METADATA_VIDEO_ASPECT, ffmpeg->pl);
+       break;
+ 
+-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+     case AVMEDIA_TYPE_SUBTITLE:
+-#else
+-    case CODEC_TYPE_SUBTITLE:
+-#endif
+       sub_streams++;
+       break;
+ 
+diff -r 70494a8fd3f5 -r 804a298afa60 src/lavf_utils.h
+--- a/src/lavf_utils.h	Wed Aug 17 09:34:22 2011 +0200
++++ b/src/lavf_utils.h	Mon Aug 29 11:22:09 2011 +0200
+@@ -22,6 +22,12 @@
+ #ifndef VALHALLA_LAVF_UTILS
+ #define VALHALLA_LAVF_UTILS
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 64, 0)
++#define AVMEDIA_TYPE_AUDIO    CODEC_TYPE_AUDIO
++#define AVMEDIA_TYPE_VIDEO    CODEC_TYPE_VIDEO
++#define AVMEDIA_TYPE_SUBTITLE CODEC_TYPE_SUBTITLE
++#endif /* LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 64, 0) */
++
+ const char *vh_lavf_utils_fmtname_get (const char *suffix);
+ AVFormatContext *vh_lavf_utils_open_input_file (const char *file);
+ 
+diff -r 70494a8fd3f5 -r 804a298afa60 src/parser.c
+--- a/src/parser.c	Wed Aug 17 09:34:22 2011 +0200
++++ b/src/parser.c	Mon Aug 29 11:22:09 2011 +0200
+@@ -343,21 +343,9 @@
+   for (i = 0; i < ctx->nb_streams; i++)
+   {
+     AVStream *st = ctx->streams[i];
+-    if (st->codec->codec_type ==
+-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+-    AVMEDIA_TYPE_VIDEO
+-#else
+-    CODEC_TYPE_VIDEO
+-#endif
+-    )
++    if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+       video_st = 1;
+-    else if (st->codec->codec_type ==
+-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+-    AVMEDIA_TYPE_AUDIO
+-#else
+-    CODEC_TYPE_AUDIO
+-#endif
+-    )
++    else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+       audio_st = 1;
+   }
+ 
+

diff --git a/media-libs/libvalhalla/libvalhalla-1.0.1.ebuild b/media-libs/libvalhalla/libvalhalla-1.0.1.ebuild
deleted file mode 100644
index 25d4dab..0000000
--- a/media-libs/libvalhalla/libvalhalla-1.0.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Tiziano Müller
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit multilib
-
-GRABBERS="+allocine +amazon dummy +exif ffmpeg +imdb +lastfm +local
-+lyricwiki +nfo +tvdb +tmdb +tvrage"
-
-DESCRIPTION="A tiny media scanner API."
-HOMEPAGE="http://libvalhalla.geexbox.org/"
-SRC_URI="http://libvalhalla.geexbox.org/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug doc static-libs"
-for g in ${GRABBERS} ; do IUSE="${IUSE} ${g/${g#+}}grabber-${g#+}" ; done
-
-RDEPEND="dev-db/sqlite:3
-	>=net-misc/curl-7.19.7
-	grabber-allocine? ( dev-libs/libxml2 )
-	grabber-amazon? ( dev-libs/libgcrypt
-		media-video/ffmpeg
-		dev-libs/libxml2 )
-	grabber-nfo? ( dev-libs/libnfo )
-	grabber-exif? ( media-libs/libexif )
-	grabber-imdb? ( dev-libs/libxml2 )
-	grabber-ffmpeg? ( media-video/ffmpeg )
-	grabber-lastfm? ( media-video/ffmpeg dev-libs/libxml2 )
-	grabber-lyricwiki? ( dev-libs/libxml2 )
-	grabber-tmdb? ( media-video/ffmpeg dev-libs/libxml2 )
-	grabber-tvdb? ( media-video/ffmpeg dev-libs/libxml2 )
-	grabber-tvrage? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	# avoid parallel install issue and linking in src_install
-	sed -i \
-		-e 's|: $(BUILD_RULES)|:|' \
-		src/Makefile || die "sed failed"
-
-	# avoid installing test-app
-	sed -i \
-		-e 's| install-test||' \
-		Makefile || die "sed failed"
-
-	sed -i \
-		-e "s|/libvalhalla|/${PF}/html|" \
-		DOCS/Makefile || die "sed failed"
-}
-
-src_configure() {
-	local myconf=""
-	for g in ${GRABBERS} ; do
-		myconf="${myconf} $(use_enable grabber-${g#+})"
-	done
-
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable static-libs static) \
-		$(use_enable debug ) \
-		--disable-optimize \
-		--disable-strip \
-		$(use_enable doc) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog README TODO
-}
-

diff --git a/media-libs/libvalhalla/libvalhalla-2.0.0_pre20100821.ebuild b/media-libs/libvalhalla/libvalhalla-2.0.0.ebuild
similarity index 67%
rename from media-libs/libvalhalla/libvalhalla-2.0.0_pre20100821.ebuild
rename to media-libs/libvalhalla/libvalhalla-2.0.0.ebuild
index 40d3187..651446b 100644
--- a/media-libs/libvalhalla/libvalhalla-2.0.0_pre20100821.ebuild
+++ b/media-libs/libvalhalla/libvalhalla-2.0.0.ebuild
@@ -1,36 +1,36 @@
-# Copyright 1999-2010 Tiziano Müller
+# Copyright 1999-2011 Tiziano Müller
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
-inherit multilib
+inherit eutils multilib
 
 DESCRIPTION="A tiny media scanner API."
 HOMEPAGE="http://libvalhalla.geexbox.org/"
-SRC_URI="http://dev-zero.ch/gentoo/distfiles/${P}.tbz2"
+SRC_URI="http://libvalhalla.geexbox.org/releases/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug doc static-libs +grabber-allocine +grabber-amazon grabber-dummy
-+grabber-chartlyrics +grabber-exif grabber-ffmpeg +grabber-imdb +grabber-lastfm
+IUSE="debug doc static-libs +grabber-allocine +grabber-amazon +grabber-chartlyrics
+grabber-dummy +grabber-exif grabber-ffmpeg +grabber-imdb +grabber-lastfm
 +grabber-local +grabber-lyricwiki +grabber-nfo +grabber-tvdb +grabber-tmdb +grabber-tvrage"
 
 RDEPEND="dev-db/sqlite:3
 	>=net-misc/curl-7.19.7
 	grabber-allocine? ( dev-libs/libxml2 )
 	grabber-amazon? ( dev-libs/libgcrypt
-		media-video/ffmpeg
+		virtual/ffmpeg
 		dev-libs/libxml2 )
 	grabber-nfo? ( dev-libs/libnfo )
 	grabber-exif? ( media-libs/libexif )
 	grabber-imdb? ( dev-libs/libxml2 )
-	grabber-ffmpeg? ( media-video/ffmpeg )
-	grabber-lastfm? ( media-video/ffmpeg dev-libs/libxml2 )
+	grabber-ffmpeg? ( virtual/ffmpeg )
+	grabber-lastfm? ( virtual/ffmpeg dev-libs/libxml2 )
 	grabber-lyricwiki? ( dev-libs/libxml2 )
-	grabber-tmdb? ( media-video/ffmpeg dev-libs/libxml2 )
-	grabber-tvdb? ( media-video/ffmpeg dev-libs/libxml2 )
+	grabber-tmdb? ( virtual/ffmpeg dev-libs/libxml2 )
+	grabber-tvdb? ( virtual/ffmpeg dev-libs/libxml2 )
 	grabber-tvrage? ( dev-libs/libxml2 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -45,6 +45,10 @@ src_prepare() {
 	sed -i \
 		-e "s|/libvalhalla|/${PF}/html|" \
 		DOCS/Makefile || die "sed failed"
+
+	epatch \
+		"${FILESDIR}"/${PV}-libav-fixes-{70494a8fd3f5,804a298afa60}.patch \
+		"${FILESDIR}/${PV}-curl-fixes-f90b201e130c.patch"
 }
 
 src_configure() {
@@ -55,6 +59,7 @@ src_configure() {
 		fi
 	done
 
+	# no autoconf
 	./configure \
 		--prefix=/usr \
 		--libdir=/usr/$(get_libdir) \
@@ -65,10 +70,3 @@ src_configure() {
 		$(use_enable doc) \
 		${myconf} || die "configure failed"
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog README TODO
-}
-