version bump

Package-Manager: portage-2.1.9.24/cvs/Linux i686

5 files changed, 90 insertions, 6 deletions

diff --git a/media-plugins/vdr-music/ChangeLog b/media-plugins/vdr-music/ChangeLog
index 05f9ba4accc1..107d90e47cb6 100644
--- a/media-plugins/vdr-music/ChangeLog
+++ b/media-plugins/vdr-music/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-music
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v 1.10 2010/12/30 00:02:54 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v 1.11 2010/12/31 14:43:39 hd_brummy Exp $
+
+*vdr-music-0.9.3 (31 Dec 2010)
+
+  31 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-music-0.9.3.ebuild, +files/vdr-music-0.9.3-makefile.patch,
+  metadata.xml:
+  version bump
 
   30 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-music-0.2.0.ebuild, +files/vdr-music-0.2.0-ImageMagick-header.diff:
diff --git a/media-plugins/vdr-music/Manifest b/media-plugins/vdr-music/Manifest
index 401daa7e6e65..69a382c8b7d7 100644
--- a/media-plugins/vdr-music/Manifest
+++ b/media-plugins/vdr-music/Manifest
@@ -8,15 +8,18 @@ AUX vdr-music-0.2.0-glibc-2.10.patch 3136 RMD160 fe3e98c337117cab97c843bb7038921
 AUX vdr-music-0.2.0-graphtftcoverfix.diff 7418 RMD160 c38b89db49ce9ed07a8b8a08bdf3ea39cd6ff5e3 SHA1 50bb45c2c9507637dfac6a2644bbe624e241c722 SHA256 0a0d120292092f9bbc998f2b37d3518cf93cd4999b0039f109829e70998076b6
 AUX vdr-music-0.2.0-lyrics.diff 650 RMD160 8355089f1c70542f894659014c910452dc084310 SHA1 7c0c826806e3f3c29c9bbb6b121f1239e5fa8914 SHA256 854319d92e5d4a6840be922d4c891dbb01813fadb2377236379b75e50fdcf12f
 AUX vdr-music-0.2.0-vdr-1.5.x.diff 742 RMD160 a7719705515819f5c991f85f8bb7bc71d0f2b9fa SHA1 18a0b48224b241d4f8333a5dbf12874df913ff76 SHA256 5db123db44bad1309fd478e1ad46f86d01de02f5f1655d766868f569e0c293c9
+AUX vdr-music-0.9.3-makefile.patch 544 RMD160 fe639fd4cb1364052a5903b59f474625d54275d1 SHA1 ce6eb46723ebb6c33dc98819a4ac72570ff18280 SHA256 876f14b2b57392a691e953cab13491a3b04f44345aeb3904a6ace18b4bb746d8
 DIST vdr-music-0.2.0.tar.gz 507411 RMD160 131aebca586d26d65d4616c5fa2e58a6fa109d11 SHA1 f1bf23c12580299643194278553cf71b901773f1 SHA256 f01149d0d32cc32dabbf8868f2ef0c45540205a102d69138ccedc57976740b20
+DIST vdr-music-0.9.3-testing.tgz 820528 RMD160 f547a8c4fcb86fe3736bb3cb6a0e2d4d387048e5 SHA1 627739ac9c981b68edfdd710ae27bd39a48506cb SHA256 8b9776b7dfc5f080724bec63824fa636de075097df5c18e29518fea9ad0c3bcc
 EBUILD vdr-music-0.2.0.ebuild 2663 RMD160 3e4a45ee42a4678558518b6cdbf8a0ef11cd3613 SHA1 65592c0e28d61b1df58d3e1d94d8857b2743b1f3 SHA256 60c38a2d4923d613c0dd8c4380adb5ffb011de3ed92989a431f00dd75fadfc65
-MISC ChangeLog 2037 RMD160 024eadebb5a6de6b05a7d54ca7a23e058a5fa5e2 SHA1 acdfa0e4f314382aa6e29a3e20f42b6aaea7294d SHA256 a1229ed33601fc0949f0860a4874c503cfc6535be9e35edfd835a9ace8f87d41
-MISC metadata.xml 504 RMD160 325523ec2d5aeb7302a5b75bf11e8186cf46836a SHA1 2ec61cdc0fc73dc183699d23cb88dd3202927be7 SHA256 ba58537a2d75f5bd8d3237d79f2dbb6cfb2e5fb58426a2be4f20961eb3591b37
+EBUILD vdr-music-0.9.3.ebuild 1824 RMD160 0272d0cbaa454b18e37de7acba6c57e840d17256 SHA1 d07ba16042f7a7578e276fc4965346bff54724f9 SHA256 4ef8c05ce5690a6b5626c952834963ed6ba4c6498b1514d43dd249a60d67a3dc
+MISC ChangeLog 2222 RMD160 db0c66afec6b908d2d2056498cee15bd874ae2f5 SHA1 0f90b60469336ae2b2272028edad6baddf057b52 SHA256 1e510a324858734fe406759887c98892b0d73dd97f765be2b5403218ee348cf6
+MISC metadata.xml 607 RMD160 07cf6f708192d07ce9dd5654f5c88acfe1379142 SHA1 21bd7bf8e6982d0334eefd4260a49234f8cf8e63 SHA256 ac2b9a31e45d2c781f579c460e5952d58a45756ca6c305c31a042a68a5a978e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFNG8xidn07HTTCgIoRAutBAKCIJHL/c8gxpylS5SRpj1IHY/wf5gCeJg51
-tG41Mzf8iIHwgciVD9kYUiE=
-=X/ho
+iD8DBQFNHexQdn07HTTCgIoRAlMuAKCXniVCck0m5bEunSaCRbvWn3BiuwCfRMP6
+CJXd4Tne/L8sfo4P4uYZWcY=
+=9ZGc
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-music/files/vdr-music-0.9.3-makefile.patch b/media-plugins/vdr-music/files/vdr-music-0.9.3-makefile.patch
new file mode 100644
index 000000000000..435c12c18ae4
--- /dev/null
+++ b/media-plugins/vdr-music/files/vdr-music-0.9.3-makefile.patch
@@ -0,0 +1,12 @@
+diff -Naur music-0.9.3-testing.orig//Makefile music-0.9.3-testing/Makefile
+--- music-0.9.3-testing.orig//Makefile  2010-03-18 18:54:58.000000000 +0100
++++ music-0.9.3-testing/Makefile        2010-03-18 18:56:11.000000000 +0100
+@@ -72,7 +72,7 @@
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+
+ ### Test whether VDR has locale support
+-VDRLOCALE = $(shell grep '^LOCALEDIR' $(VDRDIR)/Makefile)
++VDRLOCALE = $(shell grep '^LOCDIR' $(VDRDIR)/Make.config)
+
+ ### The name of the distribution archive:
+
diff --git a/media-plugins/vdr-music/metadata.xml b/media-plugins/vdr-music/metadata.xml
index e9f59c098cc7..f57f3232cf0a 100644
--- a/media-plugins/vdr-music/metadata.xml
+++ b/media-plugins/vdr-music/metadata.xml
@@ -12,6 +12,7 @@
 	<flag name='ff-card'>Enables scrollmode on FF-Card</flag>
 	<flag name='graphtft'>Enable support for
 		<pkg>media-plugins/vdr-graphtft</pkg></flag>
+	<flag name='hd'>Support for HighDefinition OSD on softdecoder( e.g xineliboutput, vdpau, ehd )</flag>
 </use>
 </pkgmetadata>
 
diff --git a/media-plugins/vdr-music/vdr-music-0.9.3.ebuild b/media-plugins/vdr-music/vdr-music-0.9.3.ebuild
new file mode 100644
index 000000000000..b4278b5a53d4
--- /dev/null
+++ b/media-plugins/vdr-music/vdr-music-0.9.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/vdr-music-0.9.3.ebuild,v 1.1 2010/12/31 14:43:39 hd_brummy Exp $
+
+EAPI="2"
+
+inherit vdr-plugin
+
+MY_P="${P}-testing"
+S="${WORKDIR}/music-${PV}-testing"
+
+DESCRIPTION="VDR plugin: music"
+HOMEPAGE="http://www.vdr.glaserei-franz.de/vdrplugins.htm"
+SRC_URI="http://www.vdr.glaserei-franz.de/files/${MY_P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="+hd +truetype +imagemagick debug graphtft sndfile vorbis"
+
+PATCHES=("${FILESDIR}/${P}-makefile.patch")
+
+DEPEND=">=media-video/vdr-1.6.0
+		media-libs/libmad
+		media-libs/libid3tag
+		graphtft? ( media-gfx/imagemagick[png] )
+		imagemagick? ( media-gfx/imagemagick[png] )
+		sndfile? ( media-libs/libsndfile )
+		vorbis? ( media-libs/libvorbis )
+		!imagemagick? (
+			!graphtft? ( media-libs/imlib2[png] )
+		)"
+
+RDEPEND="sys-process/at
+		graphtft? ( >=media-plugins/vdr-graphtft-0.1.5 )"
+
+src_prepare() {
+	vdr-plugin_src_prepare
+
+	use !vorbis && sed -i Makefile -e "s:#WITHOUT_LIBVORBISFILE=1:WITHOUT_LIBVORBISFILE=1:"
+	use !hd && sed -i Makefile -e "s:HAVE_HD_OSD=1:#HAVE_HD_OSD=1:"
+	use !sndfile && sed -i Makefile -e "s:#WITHOUT_LIBSNDFILE=1:WITHOUT_LIBSNDFILE=1:"
+	use !truetype && sed -i Makefile -e "s:HAVE_FREETYPE=1:#HAVE_FREETYPE=1:"
+	use !debug && sed -i Makefile -e "s:DEBUG=1:#DEBUG=1:"
+	use graphtft || use imagemagick && sed -i Makefile \
+		-e "s:#HAVE_MAGICK=1:HAVE_MAGICK=1:" \
+		-e "s:#MAGICKDIR=:MAGICKDIR=:"
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	insinto /etc/vdr/plugins/music
+	doins -r music/*
+	chown -R vdr:vdr "${D}"/etc/vdr/plugins/music
+
+	exeinto /usr/share/vdr/music/downloads/music_cover
+	doexe music/downloads/music_cover/*
+	chown -R vdr:vdr "${D}"/usr/share/vdr/music
+}