initial ebuild; moved from vdr-testing overlay; Thanks to T.Kost T.Rheinhold

(Portage version: 2.1.3.19)

9 files changed, 625 insertions, 0 deletions

diff --git a/media-plugins/vdr-music/ChangeLog b/media-plugins/vdr-music/ChangeLog
new file mode 100644
index 000000000000..d65fed666a8d
--- /dev/null
+++ b/media-plugins/vdr-music/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for media-plugins/vdr-music
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-music/ChangeLog,v 1.1 2008/01/13 16:40:51 hd_brummy Exp $
+
+*vdr-music-0.2.0 (13 Jan 2008)
+
+  13 Jan 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-music-0.2.0-gentoo.diff,
+  +files/vdr-music-0.2.0-graphtftcoverfix.diff,
+  +files/vdr-music-0.2.0-lyrics.diff, +files/vdr-music-0.2.0-vdr-1.5.x.diff,
+  +metadata.xml, +vdr-music-0.2.0.ebuild:
+  initial ebuild; moved from vdr-testing overlay; Thanks to T.Kost T.Rheinhold
+
diff --git a/media-plugins/vdr-music/Manifest b/media-plugins/vdr-music/Manifest
new file mode 100644
index 000000000000..338a39eea3a7
--- /dev/null
+++ b/media-plugins/vdr-music/Manifest
@@ -0,0 +1,32 @@
+AUX vdr-music-0.2.0-gentoo.diff 8894 RMD160 6a475bfa8e728ce6e2f4168ed9c1ca6bd4785a43 SHA1 72a70ca5e975de407e628d0552ad2dde9dc1d0eb SHA256 58d07c1ab81983a3e839f07e982ee709b09ba56f38827c3b636d2731177aaf6f
+MD5 292257d17287c69c8b1851c075184e48 files/vdr-music-0.2.0-gentoo.diff 8894
+RMD160 6a475bfa8e728ce6e2f4168ed9c1ca6bd4785a43 files/vdr-music-0.2.0-gentoo.diff 8894
+SHA256 58d07c1ab81983a3e839f07e982ee709b09ba56f38827c3b636d2731177aaf6f files/vdr-music-0.2.0-gentoo.diff 8894
+AUX vdr-music-0.2.0-graphtftcoverfix.diff 7418 RMD160 c38b89db49ce9ed07a8b8a08bdf3ea39cd6ff5e3 SHA1 50bb45c2c9507637dfac6a2644bbe624e241c722 SHA256 0a0d120292092f9bbc998f2b37d3518cf93cd4999b0039f109829e70998076b6
+MD5 e1be0d8d40d87a577fc2123c8f8cd179 files/vdr-music-0.2.0-graphtftcoverfix.diff 7418
+RMD160 c38b89db49ce9ed07a8b8a08bdf3ea39cd6ff5e3 files/vdr-music-0.2.0-graphtftcoverfix.diff 7418
+SHA256 0a0d120292092f9bbc998f2b37d3518cf93cd4999b0039f109829e70998076b6 files/vdr-music-0.2.0-graphtftcoverfix.diff 7418
+AUX vdr-music-0.2.0-lyrics.diff 650 RMD160 8355089f1c70542f894659014c910452dc084310 SHA1 7c0c826806e3f3c29c9bbb6b121f1239e5fa8914 SHA256 854319d92e5d4a6840be922d4c891dbb01813fadb2377236379b75e50fdcf12f
+MD5 ee7fcddb4a974aded6936aeffd71c22b files/vdr-music-0.2.0-lyrics.diff 650
+RMD160 8355089f1c70542f894659014c910452dc084310 files/vdr-music-0.2.0-lyrics.diff 650
+SHA256 854319d92e5d4a6840be922d4c891dbb01813fadb2377236379b75e50fdcf12f files/vdr-music-0.2.0-lyrics.diff 650
+AUX vdr-music-0.2.0-vdr-1.5.x.diff 742 RMD160 a7719705515819f5c991f85f8bb7bc71d0f2b9fa SHA1 18a0b48224b241d4f8333a5dbf12874df913ff76 SHA256 5db123db44bad1309fd478e1ad46f86d01de02f5f1655d766868f569e0c293c9
+MD5 a8e6430658fd8c333bb9a90c09e5a4a3 files/vdr-music-0.2.0-vdr-1.5.x.diff 742
+RMD160 a7719705515819f5c991f85f8bb7bc71d0f2b9fa files/vdr-music-0.2.0-vdr-1.5.x.diff 742
+SHA256 5db123db44bad1309fd478e1ad46f86d01de02f5f1655d766868f569e0c293c9 files/vdr-music-0.2.0-vdr-1.5.x.diff 742
+DIST vdr-music-0.2.0.tar.gz 507411 RMD160 131aebca586d26d65d4616c5fa2e58a6fa109d11 SHA1 f1bf23c12580299643194278553cf71b901773f1 SHA256 f01149d0d32cc32dabbf8868f2ef0c45540205a102d69138ccedc57976740b20
+EBUILD vdr-music-0.2.0.ebuild 2700 RMD160 f3e5f67999081a23a1555560ed6e6c5e830667a9 SHA1 8ea2efb317e91596abc5f797281f7dc5bae63b23 SHA256 b05d7050a30145712a9154f9f3edc774c2d37675a91d07e95e8531d0cd37ac5d
+MD5 9ab45a63a3f27bb27744fac0e53c2494 vdr-music-0.2.0.ebuild 2700
+RMD160 f3e5f67999081a23a1555560ed6e6c5e830667a9 vdr-music-0.2.0.ebuild 2700
+SHA256 b05d7050a30145712a9154f9f3edc774c2d37675a91d07e95e8531d0cd37ac5d vdr-music-0.2.0.ebuild 2700
+MISC ChangeLog 496 RMD160 4ff62fb44a6d5ea28a22e5f522377c8b40acfdfb SHA1 77fc89b94a8f42afc7ff3e9fad2de04bae590ff8 SHA256 5684fe4f77e266cca91320c636d6a02cf94a1c043bc8a6d0439b714801b3f57f
+MD5 607d233731e4a6a4ddbddf92c51fe490 ChangeLog 496
+RMD160 4ff62fb44a6d5ea28a22e5f522377c8b40acfdfb ChangeLog 496
+SHA256 5684fe4f77e266cca91320c636d6a02cf94a1c043bc8a6d0439b714801b3f57f ChangeLog 496
+MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
+MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
+RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
+SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 metadata.xml 298
+MD5 8fe4690e2287992e4efa209b8429aec1 files/digest-vdr-music-0.2.0 247
+RMD160 c36d27f00ae72014377a77b4d428986f682a6701 files/digest-vdr-music-0.2.0 247
+SHA256 7d0d64a6f4744ae21e3ec140e8ad7d98c56d8ec7985337ff807cf4aa4a59c975 files/digest-vdr-music-0.2.0 247
diff --git a/media-plugins/vdr-music/files/digest-vdr-music-0.2.0 b/media-plugins/vdr-music/files/digest-vdr-music-0.2.0
new file mode 100644
index 000000000000..d800a0463e2c
--- /dev/null
+++ b/media-plugins/vdr-music/files/digest-vdr-music-0.2.0
@@ -0,0 +1,3 @@
+MD5 ad48e936beb1dc59cd73b0ef6b0dac84 vdr-music-0.2.0.tar.gz 507411
+RMD160 131aebca586d26d65d4616c5fa2e58a6fa109d11 vdr-music-0.2.0.tar.gz 507411
+SHA256 f01149d0d32cc32dabbf8868f2ef0c45540205a102d69138ccedc57976740b20 vdr-music-0.2.0.tar.gz 507411
diff --git a/media-plugins/vdr-music/files/vdr-music-0.2.0-gentoo.diff b/media-plugins/vdr-music/files/vdr-music-0.2.0-gentoo.diff
new file mode 100644
index 000000000000..a547d6c18a1b
--- /dev/null
+++ b/media-plugins/vdr-music/files/vdr-music-0.2.0-gentoo.diff
@@ -0,0 +1,125 @@
+diff -Naur music-0.2.0.orig/mplayer.c music-0.2.0/mplayer.c
+--- music-0.2.0.orig/mplayer.c	2008-01-06 16:31:48.000000000 +0100
++++ music-0.2.0/mplayer.c	2008-01-06 16:36:16.000000000 +0100
+@@ -824,7 +824,7 @@
+ {
+   if(!CheckVDRVersion(1,1,16,"mplayer")) return false;
+   i18n_name=Name();
+-  MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayersources.conf"));
++  MPlaySources.Load(AddDirectory(ConfigDirectory( "mplayer"),"mplayersources.conf"));
+   if(MPlaySources.Count()<1) {
+     esyslog("ERROR: you must have defined at least one source in mplayersources.conf");
+     fprintf(stderr,"No source(s) defined in mplayersources.conf\n");
+diff -Naur music-0.2.0.orig/music/data/musiccmds.dat music-0.2.0/music/data/musiccmds.dat
+--- music-0.2.0.orig/music/data/musiccmds.dat	2008-01-06 16:31:48.000000000 +0100
++++ music-0.2.0/music/data/musiccmds.dat	2008-01-06 16:34:33.000000000 +0100
+@@ -39,19 +39,19 @@
+ ###########################################################################################################################################################
+ #
+ ---- EIGENE KOMMANDOS ----------------------------------------------------------------------------------------------------------   : echo
+-Speichere aktuelle Abspielliste permanent?	  : /etc/vdr/plugins/music/scripts/music_savepl.sh;
+-Speichere aktuelles Suchergebnis permanent?	  : /etc/vdr/plugins/music/scripts/music_savesl.sh;
+-Kopiere Track zu CopyDir?	                  : /etc/vdr/plugins/music/scripts/music_copytrack.sh
+-Lösche ausgewähltes Verzeichnis komplett?         : screen -A -m -d -S deletecopydir /etc/vdr/plugins/music/scripts/music_deletecopydir.sh
++Speichere aktuelle Abspielliste permanent?	  : /usr/share/vdr/music/scripts/music_savepl.sh;
++Speichere aktuelles Suchergebnis permanent?	  : /usr/share/vdr/music/scripts/music_savesl.sh;
++Kopiere Track zu CopyDir?	                  : /usr/share/vdr/music/scripts/music_copytrack.sh
++Lösche ausgewähltes Verzeichnis komplett?         : screen -A -m -d -S deletecopydir /usr/share/vdr/music/scripts/music_deletecopydir.sh
+ --------------------------------------------------------------------------------------------------------------------------------   : echo
+ CD auswerfen?					  : /usr/bin/eject /dev/hdc;
+ CD einziehen?					  : /usr/bin/eject -t /dev/hdc;
+-CD Disk Info?					  : /usr/bin/eject -t /dev/hdc; /etc/vdr/plugins/music/scripts/music_cddiskinfo.sh;
+-CD Disk loeschen?				  : screen -A -m -d -S cdblank  /etc/vdr/plugins/music/scripts/music_cdblank.sh;
+-Abgespeicherte Playliste als Audio-CD brennen?	  : screen -A -m -d -S cdburn   /etc/vdr/plugins/music/scripts/music_burnaudiocd.sh
+-Abgespeicherte Playliste als MP3-Daten-CD brennen?: screen -A -m -d -S mp3burn  /etc/vdr/plugins/music/scripts/music_burnmp3cd.sh
+-Tracks der abgespeicherten Playliste kopieren?	  : screen -A -m -d -S copyall  /etc/vdr/plugins/music/scripts/music_copyall.sh
++CD Disk Info?					  : /usr/bin/eject -t /dev/hdc; /usr/share/vdr/music/scripts/music_cddiskinfo.sh;
++CD Disk loeschen?				  : screen -A -m -d -S cdblank  /usr/share/vdr/music/scripts/music_cdblank.sh;
++Abgespeicherte Playliste als Audio-CD brennen?	  : screen -A -m -d -S cdburn   /usr/share/vdr/music/scripts/music_burnaudiocd.sh
++Abgespeicherte Playliste als MP3-Daten-CD brennen?: screen -A -m -d -S mp3burn  /usr/share/vdr/music/scripts/music_burnmp3cd.sh
++Tracks der abgespeicherten Playliste kopieren?	  : screen -A -m -d -S copyall  /usr/share/vdr/music/scripts/music_copyall.sh
+ --------------------------------------------------------------------------------------------------------------------------------   : echo
+ Hilfe						  : cat /etc/vdr/plugins/music/data/help.dat;
+ Check Path                                        : echo $PATH;
+-Neue Themedatei erstellen                         : /etc/vdr/plugins/music/scripts/music_createtheme.sh;
++Neue Themedatei erstellen                         : /usr/share/vdr/music/scripts/music_createtheme.sh;
+diff -Naur music-0.2.0.orig/music/data/webstreams.dat music-0.2.0/music/data/webstreams.dat
+--- music-0.2.0.orig/music/data/webstreams.dat	2008-01-06 16:31:48.000000000 +0100
++++ music-0.2.0/music/data/webstreams.dat	2008-01-06 16:42:26.000000000 +0100
+@@ -1,25 +1,25 @@
+ #--------------------------------------------------------------------------------------------------------------------------------   : echo
+ #   UPDATE WEBSTREAMS
+ #--------------------------------------------------------------------------------------------------------------------------------   : echo
+-TIP:
+-Change ../music/data/webstreams.dat with your editor.
+-Maybe you can uncomment the lines too.
+-After that, delete these lines
++# TIP:
++# Change ../music/data/webstreams.dat with your editor.
++# Maybe you can uncomment the lines too.
++# After that, delete these lines
+ 
+ #---- Top Streams ---------------------------------------------------------------------------- : echo
+-  * Genre Top 10 *?	  	: echo "/VDR/bin/shout2vdr.sh 'TopTen'" | at now;
++  * Genre Top 10 *?	  	: echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'TopTen'" | at now;
+ #---- Electronic  ---------------------------------------------------------------------------- : echo
+   * Genre Dance *?	  	: echo "/VDR/bin/shout2vdr.sh 'Disco'" | at now;
+-  * Genre Club *?	  	: echo "/VDR/bin/shout2vdr.sh 'Club'" | at now;
+-  * Genre House *?	  	: echo "/VDR/bin/shout2vdr.sh 'House'" | at now;
+-  * Genre Trance *?	  	: echo "/VDR/bin/shout2vdr.sh 'Trance'" | at now;
+-  * Genre Techno *?	  	: echo "/VDR/bin/shout2vdr.sh 'Techno'" | at now;
++  * Genre Club *?	  	: echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Club'" | at now;
++  * Genre House *?	  	: echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'House'" | at now;
++  * Genre Trance *?	  	: echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Trance'" | at now;
++  * Genre Techno *?	  	: echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Techno'" | at now;
+ #---- Pop/Rock    ---------------------------------------------------------------------------- : echo
+-  * Genre Top 40 *?	  	: echo "/VDR/bin/shout2vdr.sh 'Top 40'" | at now;
+-  * Genre Metal Rock *?	  	: echo "/VDR/bin/shout2vdr.sh 'Metal'" | at now;
+-  * Genre Rock *?	  	: echo "/VDR/bin/shout2vdr.sh 'Rock'" | at now;
+-  * Genre Pop *?	  	: echo "/VDR/bin/shout2vdr.sh 'Pop'" | at now;
+-  * Genre 80s *?	  	: echo "/VDR/bin/shout2vdr.sh '80s'" | at now;
+-  * Genre Oldies *?	  	: echo "/VDR/bin/shout2vdr.sh 'Oldies'" | at now;
+-  * Genre Classic Rock/Pop *?   : echo "/VDR/bin/shout2vdr.sh 'Classic'" | at now;
++  * Genre Top 40 *?	  	: echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Top 40'" | at now;
++  * Genre Metal Rock *?	  	: echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Metal'" | at now;
++  * Genre Rock *?	  	: echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Rock'" | at now;
++  * Genre Pop *?	  	: echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Pop'" | at now;
++  * Genre 80s *?	  	: echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr '80s'" | at now;
++  * Genre Oldies *?	  	: echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Oldies'" | at now;
++  * Genre Classic Rock/Pop *?   : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Classic'" | at now;
+ #--------------------------------------------------------------------------------------------------------------------------------   : echo
+diff -Naur music-0.2.0.orig/music/musicsources.conf music-0.2.0/music/musicsources.conf
+--- music-0.2.0.orig/music/musicsources.conf	2008-01-06 16:31:48.000000000 +0100
++++ music-0.2.0/music/musicsources.conf	2008-01-06 16:45:20.000000000 +0100
+@@ -1,3 +1,3 @@
+-/vdr_daten/mp3;Lokale Musik;0;*.mp3/*.ogg/*.wav/*.MP3/*.OGG/*.WAV/*.m3u/*.M3U/*.pls/*.PLS
++/mnt/music;Lokale Musik;0;*.mp3/*.ogg/*.wav/*.MP3/*.OGG/*.WAV/*.m3u/*.M3U/*.pls/*.PLS
+ /mnt/cdfs;CD-Rom;1;*.mp3/*.wav/*.MP3/*.WAV/*.m3u/*.M3U/*.pls/*.PLS
+ /media/usbstick;USB-Stick;1;*.mp3/*.ogg/*.wav/*.MP3/*.OGG/*.WAV/*.m3u/*.M3U/*.pls/*.PLS
+diff -Naur music-0.2.0.orig/music/scripts/music_savepl.sh music-0.2.0/music/scripts/music_savepl.sh
+--- music-0.2.0.orig/music/scripts/music_savepl.sh	2008-01-06 16:31:48.000000000 +0100
++++ music-0.2.0/music/scripts/music_savepl.sh	2008-01-06 16:44:09.000000000 +0100
+@@ -23,7 +23,7 @@
+ #
+ #
+ DATE=`date +%Y%m%d_%T`
+-TARGETDIR="/vdr_daten/mp3"
++TARGETDIR="/mnt/music"
+ SOURCE="$TARGETDIR/@current.m3u"
+ TARGET="$TARGETDIR/current-$DATE.m3u"
+ #
+diff -Naur music-0.2.0.orig/music/data/user.dat music-0.2.0/music/data/user.dat
+--- music-0.2.0.orig/music/data/user.dat	2008-01-06 17:14:05.000000000 +0100
++++ music-0.2.0/music/data/user.dat	2008-01-06 17:14:23.000000000 +0100
+@@ -3,11 +3,3 @@
+ User2
+ User3
+ User4
+-
+-TIP:
+-Edit ../music/data/user.dat with your editor
+-Music will do the rest for you :D
+-Keep care that an user "admin" exists
+-otherwise you cant do some operations.
+-Dont forget to delete this lines.
+-After that , delete these lines.
diff --git a/media-plugins/vdr-music/files/vdr-music-0.2.0-graphtftcoverfix.diff b/media-plugins/vdr-music/files/vdr-music-0.2.0-graphtftcoverfix.diff
new file mode 100644
index 000000000000..074de7703c8e
--- /dev/null
+++ b/media-plugins/vdr-music/files/vdr-music-0.2.0-graphtftcoverfix.diff
@@ -0,0 +1,280 @@
+diff -ruN music-0.2.0-orig/Makefile music-0.2.0/Makefile
+--- music-0.2.0-orig/Makefile	2007-05-18 15:29:15.000000000 +0200
++++ music-0.2.0/Makefile	2007-07-29 13:14:03.000000000 +0200
+@@ -52,7 +52,7 @@
+ 
+ # INTERNAL USE , DONT UNCOMMENT OR PLUGIN WILL NOT COMPILE
+ #IM_A_MORON=1
+-#HAVE_TUNED_GTFT=1
++HAVE_GRAPHTFT=1
+ 
+ ### The C++ compiler and options:
+ CXX      ?= g++
+@@ -159,8 +159,8 @@
+ 	DEFINES += -DIM_A_MORON
+ endif
+ 
+-ifdef HAVE_TUNED_GTFT
+-	DEFINES += -DHAVE_TUNED_GTFT
++ifdef HAVE_GRAPHTFT
++	DEFINES += -DHAVE_GRAPHTFT
+ endif
+ 
+ ifndef WITHOUT_LIBSNDFILE
+diff -ruN music-0.2.0-orig/mp3control.c music-0.2.0/mp3control.c
+--- music-0.2.0-orig/mp3control.c	2007-05-18 14:32:37.000000000 +0200
++++ music-0.2.0/mp3control.c	2007-07-29 13:14:03.000000000 +0200
+@@ -156,14 +156,6 @@
+ 
+ cMP3Control::~cMP3Control()
+ {
+-#ifdef HAVE_TUNED_GTFT
+-    cPlugin *graphtft=cPluginManager::GetPlugin("graphtft");
+-    if(graphtft) cStatus::MsgImageFile("");
+-#else
+-    cPlugin *graphtft=cPluginManager::GetPlugin("graphtft");
+-    if(graphtft) graphtft->SetupParse("CoverImage", "");
+-#endif
+-
+   if(cmdMenu) {delete cmdMenu;}
+   cmdMenu = NULL;
+ 
+@@ -372,15 +364,6 @@
+       }
+     }
+ 
+-
+-#ifdef HAVE_TUNED_GTFT
+-    cPlugin *graphtft=cPluginManager::GetPlugin("graphtft");
+-    if(graphtft) cStatus::MsgImageFile(coverpicture ? coverpicture:"");
+-#else
+-    cPlugin *graphtft=cPluginManager::GetPlugin("graphtft");
+-    if(graphtft) graphtft->SetupParse("CoverImage", coverpicture ? coverpicture:"");
+-#endif
+-
+   }
+   CanLoadCover = false;
+ }
+diff -ruN music-0.2.0-orig/player-mp3.c music-0.2.0/player-mp3.c
+--- music-0.2.0-orig/player-mp3.c	2007-07-05 19:48:54.000000000 +0200
++++ music-0.2.0/player-mp3.c	2007-07-29 13:14:03.000000000 +0200
+@@ -1974,6 +1974,9 @@
+               ExistsLyrics(playing->Fullname());
+ 
+               // Cover + Backgroundstuff
++#ifdef HAVE_GRAPHTFT
++              LoadGraphtftImage(playing->Fullname());
++#endif
+ 
+               if( (!MP3Setup.EnableVis) || ((showcoveronly) && (!MP3Setup.VisInCoverMode))  ) {
+ 	        LoadImage(playing->Fullname(), true);
+@@ -2171,6 +2174,7 @@
+     playModeMutex.Unlock();
+     Lock();
+     }
++  Unlock();
+ }
+ 
+ void cMP3Player::Pause(void)
+@@ -2403,6 +2407,7 @@
+   strcpy (imageFile, fullname);
+   strcpy (coverpicture, "");
+ 
++
+   // Spectrum-Analyzer enabled
+   if((MP3Setup.EnableVis) && (!coveronly) ) {
+     p = strncpy(imageFile, MP3VisLoader.VisLoaderBackground(), sizeof(imageFile));
+@@ -2416,11 +2421,6 @@
+       }
+     } 
+   }
+-
+-
+-
+-
+-
+   //
+   // track specific image, e.g. <song>.jpg
+   //
+@@ -2524,13 +2524,160 @@
+   if (!strlen (coverpicture)) {
+     DefaultImage();
+   }
+-
+-  if (!(strcmp(coverpicture, oldimagefile))==0)
++  //
++  // path to cover changed ?
++  if (!(strcmp(coverpicture, oldimagefile))==0) {
+     CanLoadCover=true;
+-  else
++    }
++  else {
+     CanLoadCover=false;
++  }
++}
++
++
++#ifdef HAVE_GRAPHTFT
++void cMP3Player::LoadGraphtftImage(const char *fullsongpath)
++{
++  size_t i;
++  char graphcover[256];
++  char imageFile[256];
++  char oldimagefile[256];
++  char *p, *q = NULL;
++  char Artist[256];
++  char *imageSuffixes[] = { "jpg", "png" };
+  
++  d(printf("music[%d]: player: gtft: checking (%s) for images\n", getpid (), fullsongpath));
++
++
++  strcpy (oldimagefile, graphcover);
++  strcpy (imageFile, fullsongpath);
++  strcpy (graphcover, "");
++
++
++  //
++  // track specific image, e.g. <song>.jpg
++  //
++
++  if (!strlen (graphcover))
++  {
++
++    p = strrchr (imageFile, '.');
++    if (p)
++    {
++      for (i = 0; i < sizeof (imageSuffixes) / sizeof (imageSuffixes[0]); i++)
++      {
++        strcpy (p + 1, imageSuffixes[i]);
++        d(printf("music[%d]: player: gtft: (%s)\n", getpid (), imageFile));
++        q = CheckImage (imageFile);
++        if (q)
++        {
++          strcpy (graphcover, q);
++        }
++      }
++    } 
++  }
++  //
++  // album specific image, e.g. cover-/front-/folder.jpg in song directory
++  //
++
++  if (!strlen (graphcover))
++  {
++    std::string fullfilename;
++    std::string Base;
++    
++    fullfilename = imageFile;
++    int len = fullfilename.length();
++
++    std::string::size_type pos  = fullfilename.rfind('/',len);
++    if(pos!=std::string::npos) {
++      //BaseDir
++      Base     = fullfilename.substr(0,pos+1);
++    }  
++
++    d(printf("music[%d]: player: gtft: directory='%s'\n", getpid(), Base.c_str()));
++
++    std::string jpegs    ="";
++    std::string b_jpegs  ="";
++    std::string pngs     ="";
++    std::string b_pngs   ="";
++
++    jpegs   = Base + "*.jpg";
++    b_jpegs = Base + "*.JPG";
++    pngs    = Base + "*.png";
++    b_pngs  = Base + "*.PNG";
++
++    d(printf("music[%d]: player: gtft: search for Cover in (%s)\n", getpid (), Base.c_str()));
++
++    unsigned int i;
++    glob_t glob_buffer;
++    glob_buffer.gl_offs = 4;
++    glob(  jpegs.c_str(), 0              , NULL, &glob_buffer);
++    glob(b_jpegs.c_str(), GLOB_APPEND    , NULL, &glob_buffer);
++    glob(  pngs.c_str() , GLOB_APPEND    , NULL, &glob_buffer);
++    glob(b_pngs.c_str() , GLOB_APPEND    , NULL, &glob_buffer);
++
++    for (i=0; i < glob_buffer.gl_pathc; ++i) {
++      d(printf("music[%d]: player: gtft: (%s)\n", getpid(), glob_buffer.gl_pathv[i]));
++
++      if(strcasestr(glob_buffer.gl_pathv[i], "cover")) {
++        q = CheckImage (glob_buffer.gl_pathv[i]);
++        }    
++      else if(strcasestr(glob_buffer.gl_pathv[i], "front")) {
++        q = CheckImage (glob_buffer.gl_pathv[i]);
++        }    
++      else if(strcasestr(glob_buffer.gl_pathv[i], "folder")) {
++        q = CheckImage (glob_buffer.gl_pathv[i]);
++      }    
++
++      if (q) { strcpy (graphcover, q); }
++    } 
++    globfree(&glob_buffer);
++  }
++  //
++  // Artist specific image, e.g. Acdc.jpg in Artistcover directory
++  //
++  if (!strlen (graphcover)) {
++    if(artist !=NULL) {
++      strcpy(Artist, MP3Setup.CoverDir);
++      strcat(Artist, "/");
++      strcat(Artist,artist);
++      strcat(Artist, ".jpg");
++       if (Artist) {
++           d(printf("music[%d]: player: gtft: (%s)\n", getpid (), Artist));
++           q = CheckImage (Artist);
++           if (q) {
++             strcpy (graphcover, q);
++             }
++       }
++    }
++  }
++  //
++  // Default image
++  //
++  if (!strlen (graphcover)) {
++    if (!isStream) {
++      file = config;
++      file = file + "/themes/defaultcover";
++      file = file + MP3Skin.localcover;
++      strcpy(graphcover, file.c_str());
++      }	
++    else {
++      file = config;
++      file = file + "/themes/defaultcover";
++      file = file + MP3Skin.streamcover;
++      strcpy(graphcover, file.c_str());
++    }
++  }
++  //
++  // Write imagepath to /tmp
++  if( FILE *f = fopen("/tmp/graphTFT.cover", "w")) {
++    d(printf("music: player-mp3.c: write imagepath '%s' to /tmp/graphTFT.cover\n", graphcover));
++    fprintf(f, "%s\n", graphcover);
++    fclose(f);
++  }    
++
+ }
++#endif
+ 
+ 
+ void cMP3Player::CheckMpeg(void) {
+@@ -2646,4 +2793,3 @@
+ 	ptslen = 1;
+     }
+ }
+-
+diff -ruN music-0.2.0-orig/player-mp3.h music-0.2.0/player-mp3.h
+--- music-0.2.0-orig/player-mp3.h	2007-05-02 19:43:54.000000000 +0200
++++ music-0.2.0/player-mp3.h	2007-07-29 13:14:03.000000000 +0200
+@@ -200,6 +200,9 @@
+   void WaitPlayMode(ePlayMode mode, bool inv);
+   void ExistsLyrics(const char *songpath);
+   void DefaultImage(void);
++#ifdef HAVE_GRAPHTFT
++  void LoadGraphtftImage(const char *fullsongpath);
++#endif
+ protected:
+   virtual void Activate(bool On);
+   virtual void Action(void);
diff --git a/media-plugins/vdr-music/files/vdr-music-0.2.0-lyrics.diff b/media-plugins/vdr-music/files/vdr-music-0.2.0-lyrics.diff
new file mode 100644
index 000000000000..4da187354e80
--- /dev/null
+++ b/media-plugins/vdr-music/files/vdr-music-0.2.0-lyrics.diff
@@ -0,0 +1,25 @@
+--- music-0.2.0-orig/lyrics.c	2007-04-10 03:56:26.000000000 +0200
++++ music-0.2.0/lyrics.c	2007-07-31 15:08:45.000000000 +0200
+@@ -232,8 +232,8 @@
+   char *q = NULL;
+   char songFile[1024];
+ 
+-  datei = config;
+-  datei = datei + "/scripts/music_getlyrics.py";
++  
++  datei = "/usr/share/vdr/music/scripts/music_getlyrics.py";
+ 
+   SetHelp(tr("Parent"),tr("Track-"),tr("Track+"),tr("Save"));
+ 
+@@ -279,11 +279,7 @@
+         mgr->Next();
+         break;
+       case kBlue:
+-        if(user_is_admin)
+ 	  SaveExternLyrics(); 
+-	else
+-	  Skins.Message(mtError, tr("Operation denied !"));
+-  	break;
+       case kOk:
+       case kRed:
+       case kBack:
diff --git a/media-plugins/vdr-music/files/vdr-music-0.2.0-vdr-1.5.x.diff b/media-plugins/vdr-music/files/vdr-music-0.2.0-vdr-1.5.x.diff
new file mode 100644
index 000000000000..aff8b7beedf0
--- /dev/null
+++ b/media-plugins/vdr-music/files/vdr-music-0.2.0-vdr-1.5.x.diff
@@ -0,0 +1,30 @@
+diff -ruN music-0.2.0/mplayer.c~ music-0.2.0/mplayer.c
+--- music-0.2.0/mplayer.c~
++++ music-0.2.0/mplayer.c
+@@ -231,7 +231,12 @@
+ #else
+     Interface->Close();
+ #endif
++#if VDRVERSNUM >= 10500
++    visible = modeOnly = false;
++    SetNeedsFastResponse(visible);
++#else
+     needsFastResponse=visible=modeOnly=false;
++#endif
+     }
+ }
+ 
+@@ -302,7 +307,13 @@
+       Interface->Clear();
+       if(MPlayerSetup.OsdPos>0) Interface->Fill(0,3,Interface->Width(),MPlayerSetup.OsdPos,clrTransparent);
+ #endif
++#if VDRVERSNUM >= 10500
++      visible = true;
++      SetNeedsFastResponse(visible);
++      modeOnly=false;
++#else
+       needsFastResponse=visible=true; modeOnly=false;
++#endif
+       lastCurrent=lastTotal=-1;
+       flush=true;
+       }
diff --git a/media-plugins/vdr-music/metadata.xml b/media-plugins/vdr-music/metadata.xml
new file mode 100644
index 000000000000..d1b88e6872a7
--- /dev/null
+++ b/media-plugins/vdr-music/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-tv</herd>
+<maintainer>
+<email>vdr@gentoo.org</email>
+<name>Gentoo VDR Project</name>
+</maintainer>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
diff --git a/media-plugins/vdr-music/vdr-music-0.2.0.ebuild b/media-plugins/vdr-music/vdr-music-0.2.0.ebuild
new file mode 100644
index 000000000000..9c66439ca6a3
--- /dev/null
+++ b/media-plugins/vdr-music/vdr-music-0.2.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2003-2008 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.2.0.ebuild,v 1.1 2008/01/13 16:40:51 hd_brummy Exp $
+
+inherit vdr-plugin
+
+DESCRIPTION="VDR plugin: music"
+HOMEPAGE="http://www.vdr.glaserei-franz.de/"
+SRC_URI="http://www.kost.sh/vdr/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+IUSE="imagemagick debug vorbis oss ff-card 4mb-mod graphtft sndfile"
+
+PATCHES="${FILESDIR}/${P}-gentoo.diff
+	${FILESDIR}/${P}-vdr-1.5.x.diff
+	${FILESDIR}/${P}-lyrics.diff"
+
+DEPEND=">=media-video/vdr-1.3.30
+	media-libs/libmad
+	media-libs/libid3tag
+	imagemagick? ( media-gfx/imagemagick )
+	vorbis? ( media-libs/libvorbis )
+	sndfile? ( media-libs/libsndfile )
+	oss? ( media-libs/alsa-oss )
+	!imagemagick? ( media-libs/imlib2 )"
+
+RDEPEND="dev-java/blackdown-jre
+	media-tv/shoutcast2vdr
+	graphtft? ( >=media-plugins/vdr-graphtft-0.1.5 )
+	sys-process/at"
+
+pkg_setup() {
+
+	use imagemagick && local LIB="media-gfx/imagemagick"
+	use !imagemagick && local LIB="media-libs/imlib2"
+
+		if ! built_with_use $LIB png; then
+			echo
+			eerror "Please recompile $LIB with"
+			eerror "USE=\"png\""
+			die "$LIB need png support"
+		fi
+
+	vdr-plugin_pkg_setup
+}
+
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	use graphtft && epatch "${FILESDIR}/${P}-graphtftcoverfix.diff"
+
+	use !ff-card && sed -i Makefile -e "s:HAVE_FFCARD=1:#HAVE_FFCARD=1:"
+	use !vorbis && sed -i Makefile -e "s:#WITHOUT_LIBVORBISFILE=1:WITHOUT_LIBVORBISFILE=1:"
+	use !sndfile && sed -i Makefile -e "s:#WITHOUT_LIBSNDFILE=1:WITHOUT_LIBSNDFILE=1:"
+	use imagemagick && sed -i Makefile -e "s:#HAVE_MAGICK=1:HAVE_MAGICK=1:"
+	use oss && sed -i Makefile -e "s:#WITH_OSS_OUTPUT=1:WITH_OSS_OUTPUT=1:"
+	use 4mb-mod && sed -i Makefile -e "s:#HAVE_OSDMOD=1:HAVE_OSDMOD=1:"
+	use debug && sed -i Makefile -e "s:#DBG=1:DBG=1:"
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	insinto /etc/vdr/plugins/music
+	doins music/musicsources.conf
+
+	insinto /etc/vdr/plugins/music/coverviewer
+	doins -r music/coverviewer/*
+
+	insinto /etc/vdr/plugins/music/data
+	doins -r music/data/*
+
+	exeinto /etc/vdr/plugins/music/downloads/music_cover
+	doexe music/downloads/music_cover/*
+
+	insinto /etc/vdr/plugins/music/playlists
+	doins music/playlists/*
+
+	insinto /etc/vdr/plugins/music/themes
+	doins -r music/themes/*
+
+	insinto /etc/vdr/plugins/music/visual
+	doins -r music/visual/*
+
+	exeinto /usr/share/vdr/music/scripts
+	doexe music/scripts/*
+
+	keepdir /etc/vdr/plugins/music/lyrics
+}
+
+pkg_postinst() {
+	vdr-plugin_pkg_postinst
+
+	echo
+	elog "To complete your media-plugins/vdr-music install"
+	elog "take a look on:"
+	echo
+	elog "media-plugins/vdr-coverviewer"
+	elog "media-plugins/vdr-picselshow"
+	echo
+	elog " Please change your /etc/vdr/plugins/music/musicsources.conf "
+	echo
+}