reinit the tree, so we can have metadata

11 files changed, 366 insertions, 0 deletions

diff --git a/media-plugins/vdr-mp3ng/Manifest b/media-plugins/vdr-mp3ng/Manifest
new file mode 100644
index 000000000000..5ae997b9799f
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/Manifest
@@ -0,0 +1,15 @@
+AUX confd 1657 SHA256 d68a7179251aa7ee12eba82cdd711b683c81b4007d370766c985012695d4df3c SHA512 dd2e002e79dccde8f16a297a9a7cb503b780caca226c26911a9d622ef1ecfb467a088fc885332b53e551ac7779d574ba4c357c9516a07c312aa917830813c329 WHIRLPOOL 5d7505a40eea9889b632cf9844ce978a87dfe35a5a4cb51516c16bcef15104ea4c66ccab718ef789cd6c22733b21fa19954ce12418e828f39522fce52af74068
+AUX imagemagick-6.4.x.diff 444 SHA256 44276d7bb3e1863e0578229b1d6ce67f9dc54894047053f49c0546a961a6bb57 SHA512 9e50f52d1e40816c3a300378c27e8233665fc024ac9f49836d6879f21447093a28a654bb0c03d90af96ab1193be7ce7f546866dcf15223407ab85b701b4abe12 WHIRLPOOL 29e00149ca6ef48e6e9af8c7e5017aacb8c5acda07a8b53e3400206e7c734a9ca6396645113ca7ae770cf076f4cf0ffadcf78df2815587ebb6449ec31f46fe31
+AUX mp3ngsources 251 SHA256 2d25c96bc169d24d1e52395eac306a7485a8c80cf9bfac0b0eda9c440b0d30b0 SHA512 54c65aa615805dc4244ac0ccc4442ea5e7c1c583b8f33d2d90e5e4e34cfc57872a3b62be65b44b0ce180b6ad0d67bad71c161a7bf2e8ee66209909c52932593a WHIRLPOOL 8f788cb2c2211696387a39075e64774f202cc1657a0566e790276ad9e60f5520a21eb4e71d9cfd92b485ed7ca14e7fe7510998d5a266abcd1457cd5299b9a323
+AUX vdr-mp3ng-0.0.1_pre4-1.3.37.diff 1064 SHA256 ec73f3f4e4d3e458c682c4cf27ac0485a6d42ef005f3ab3f07b783189f5d0244 SHA512 53819a155e8e7b9486673957a5013431a50a620396ee76a573f9fc8248724e767346be315d9692e4726e7b199f9584a4172407075a4c6a90feae7723e568d1a6 WHIRLPOOL 9afe15cb8f53d1ebd08e6dc330e2339cacba0d282bba889f0877c8457941e1a071981c9907ad62bc15fa1bbd1110e73ae9ef0b14590773ed2627c4957bf27289
+AUX vdr-mp3ng-0.0.1_pre4-gcc4.diff 806 SHA256 2c15bc2eec50c0fb9b7a25656d01a35c82dd4905c550750171e70e378a15ca11 SHA512 6c30577fc4cf37f3a69613e88895d5b512061f44b5ce14907dce31a312887eea84d7db4eb8436c77a9419cad9cea161742f64b501f6b157fbbdd4fc7fa4aa71c WHIRLPOOL 1141a79484087581cdb6248eb43b6c28020b1ca77f0105b83656b474a1bc1639ec6b99f34ef4b296a42dfceffe8cdf845267bd3380ded306f5edeedd69722efc
+AUX vdr-mp3ng-0.0.1_pre4-gentoo.diff 1313 SHA256 766a0bbdffab942a4665d9e662c5bdcee33c5a587fe6f037da5e4ae9c5a4873c SHA512 1d3009dbf3874c44bcbd0a70ac0708351cd337f366e737abb8092e96cb9f2899678ef6a6560773980acb52a42732af3b314c3cc0777f687433033115555e6670 WHIRLPOOL b472f691487e643ea4f605d1d46c76daaf2c48fcc5e0d3d303aa7afb30f033a6ebd312645ad69235d00048c0a0221d722de6f0e1deb4e582207ae5cd6320cf45
+AUX vdr-mp3ng-0.0.1_pre4-glibc-2.10.patch 3319 SHA256 0166a3cf874f985859d2a9c8c335187153f726468ab613135f89c4715c6e18b4 SHA512 358f33aa8afc87d071cc02e2a4eebba9651e032cf11ec56178175c539a2f72406307c02a888ba5653b95a6f6e29230f6ea568e262518c713c255ef724385b548 WHIRLPOOL 1913d710eacf54703234d843546a3b9757b1fe448a28f409fccc0ed25e80074a8700ec68a811494236be558e081952ad891105b9b527c26617ddf619cdc22fb8
+AUX vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff 1768 SHA256 91ce3f8a789d756681851ecfb3a1ec296816ac3cef55b1c948397ea2f9a868c9 SHA512 8922dc3c7a6d2f033573f0932bc4dcb050a65c7c852d8ca1112976f46f9625f178d4bfad531f91d1a2a7b7a2415b4c7e0a7d91a117c11570ec3a2f9a0bb276b6 WHIRLPOOL bff6945b6c477fcad3ac35953e434e718500f43921b7fbd2bdd2d01673c7030fad67a4bbad965530584c4777bf35e492114f3bccaae2178ccbbbdc697a52bbec
+DIST vdr-mp3ng-0.0.1_pre4-span-0.0.3.diff.tar.gz 6726 SHA256 f4f947f7fa38c261c39af0cffb30a69bb641884b9efd26f5d73742170c3a6628 SHA512 537b876cf5ecdfe34969a79ec556196e48b4de1a411d7b1a50ad95c5534d5027b0d1548fb42c02cccf922f0ef961b99b1d23863b2048f12e79e0beafcd7e571f WHIRLPOOL d5b7c035827e612ea58e6fa8eb41f378e435a88ba0f05bde1d51cc95606b260b400cfe8a36498f619f19e554dd0d441036f024da02d67cb8c1dfeffba558979f
+DIST vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz 128289 SHA256 c92b220b878c98001bc6293aaa72d3247368a4d8c785e883f8fb24c4e4a09f12 SHA512 56bd73ab66276ff49670e3e7195a50b1f6560a53e88662e45d24e3bd1ffb6a7493dca3eade6ccecb887302dd4da2eb8ccc6b231ba45fbb315ace7ca3232fff99 WHIRLPOOL 3d5babf20a592a5314663692d2cad7e1bcb03d8c9154c0a0903a9f30065e6fa1e9780b32ee72529ad8189f6d88ff9e2fe29cdebd8e90a6fe38319476f84411bf
+DIST vdr-mp3ng-pictures-0.0.1.tar.gz 170089 SHA256 962d3e85b3e19e7ef1bfdd4b66947b3c5327f5691c42454b4840fdb7ec5b2288 SHA512 f9b2e683db67f1a72b92e3a73b0f1e72132907568ec196f37f9484e076ca90bec6bd58b79438b70a3fb630badcd79b8ae1401fc911c60e5256131355c783392e WHIRLPOOL d92cbfcfab3de37d551b3a9bc4a76e11d971b6356c6985acbab4630734d289e11eb588a86fb94e8ffb122f3917b5c47d7bbea0690bede79a8777c5049d35c5e3
+EBUILD vdr-mp3ng-0.0.1_pre5-r1.ebuild 2221 SHA256 78851519f3b7932c720dd87234b629f22d3255e7e9ba18cbaac785c4c1bdd8e4 SHA512 5dfd55551dbbcf90f2d625e49009b37b3c94fa8b3749a95b8f9793948675f974495697c4798859ec415a5952848ba4fc941720bb2a442e74df9b2d6eadc8f620 WHIRLPOOL 2512f3a77267b8f81b41456a90c98ba17a2bdf3146078c9cf3d1aa9dfa356c478e6ffa64e53f8f6a7438c8bdffcceda41800c55462d0a844f25610dd4e931aad
+MISC ChangeLog 2919 SHA256 045f8a41e2378eb1a28bf0bb011fd7e938a20d647813d83a77e3719054076420 SHA512 dca7569db2cadc8b728a2b718117636db4a8b007b1655b34bc5e4040bb90470a53091606949c4392a63e14722ad3f3900342fec167f0a555144f785497853444 WHIRLPOOL 92e5deb068ac347f9408f9dc31a982990b053bbe919f354bef3e1cf96428c638883105bddde2dcc52f4a9c0a69de2ce190231663f3a359abd5ce77cbde8829fa
+MISC ChangeLog-2015 4146 SHA256 afd5adb261aa4813b5302772599b888b091f613e705c7840c0edf14aafb10d94 SHA512 4be4e53a1b0d5a9d8c5c08415ff373dd42af15bdcc371b596d1443f17f963b88247ea7aa2d0fdccd8d13a4bdb0658c50033d1b02f37aff0593e6600065eac891 WHIRLPOOL 1c749a43a20251dc963b9b4677ac268853165c1c90c0b647111a423a42e10b0cf06cb220e56ed3cecfcd855c939dacb7d42b6e80f93f7d5ebaeab6ad15f81d0e
+MISC metadata.xml 500 SHA256 58eaae08b6392737c7ab2699f46514f9c3e4a776e333629cecea461c23e07bc6 SHA512 2f034f2fda1463ee1bbef42ba6903a760078cd6c80e4aac59b70ca91d595fd487bfc33237f7c5d363d4961bce8bfeb251a614d3bbedf88bd2199903b50457897 WHIRLPOOL 741c8565d8413e5ed9d64354eb539c4ce92897941b423a46240b2ca34728e70e28922ac648b07cf89659fb166593e73121a1953bd4ce216a05f8c368baa12f30
diff --git a/media-plugins/vdr-mp3ng/files/confd b/media-plugins/vdr-mp3ng/files/confd
new file mode 100644
index 000000000000..87b1563d719d
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/files/confd
@@ -0,0 +1,30 @@
+# Global config file for vdr rc-scripts
+
+# The default mount script is "mount.sh". This script is called from the
+# plugin with 2 options on commandline. The first is
+# one of mount/unmount/eject/status and gives the action to perform. The
+# second one is the base directory as defined in "mp3ngsources".
+# The script must return the exit code 0 if the action was
+# successfull and 1 if the action failed (see the comments in the example
+# "mount.sh" script which comes with the archive).
+#MOUNT="/usr/bin/mount-mp3ng.sh"
+
+# If you are using cdfs, the MP3 plugin is able to query a CDDB database for
+# the song information (like title, artist). Local CDDB lookups can be enable
+# from the setup menu and you must give the path to your local CDDB files.
+# The database layout follows the xmcd standard
+# (one subdirectory level for the categories, individual files for every disc).
+# The settings for remote CDDB lookups can be found in the setup menu, too.
+# Any information retrieved from a remote host is stored to your local CDDB
+# database, so the user running VDR needs write access to this directory.
+#CDDB="/var/cddb"
+
+# If you are using any of the networking capabilities and you have a dial-up
+# network you can use this script.
+# This script is called before and after any network access and receives one
+# option on commandline. This can either be "up" or "down", depending on if it's
+# before or after the network access. In the "up" case the script should not
+# return before the network is connected and useable. By default the plugin
+# assumes that network access can be done at any time without prior action.
+#NETWORK="/usr/bin/network.sh"
+
diff --git a/media-plugins/vdr-mp3ng/files/imagemagick-6.4.x.diff b/media-plugins/vdr-mp3ng/files/imagemagick-6.4.x.diff
new file mode 100644
index 000000000000..98b9270537ef
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/files/imagemagick-6.4.x.diff
@@ -0,0 +1,13 @@
+diff -Naur mp3ng-0.9.13-MKIV-pre3.orig/Makefile mp3ng-0.9.13-MKIV-pre3/Makefile
+--- mp3ng-0.9.13-MKIV-pre3.orig/Makefile	2008-10-25 12:43:59.000000000 +0200
++++ mp3ng-0.9.13-MKIV-pre3/Makefile	2008-10-25 12:44:59.000000000 +0200
+@@ -122,7 +122,8 @@
+ 
+ ifdef HAVE_MAGICK
+   DEFINES += -DHAVE_MAGICK
+-  LIBS += -lMagick -lMagick++
++  LIBS += -lMagickWand -lMagickCore -lMagick++
++  INCLUDES += -I/usr/include/ImageMagick
+ endif
+ 
+ ifdef HAVE_XPM
diff --git a/media-plugins/vdr-mp3ng/files/mp3ngsources b/media-plugins/vdr-mp3ng/files/mp3ngsources
new file mode 100644
index 000000000000..b33a71701cee
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/files/mp3ngsources
@@ -0,0 +1,3 @@
+/VDR/data/local_music;Lokale Musik;0;*.mp3/*.ogg/*.wav/*.MP3/*.OGG/*.WAV/*.m3u/*.M3U/*.pls/*.PLS
+/mnt/cdrom;CD-Rom;1;*.mp3/*.wav/*.MP3/*.WAV/*.m3u/*.M3U/*.pls/*.PLS
+/mnt/usbstick;USB-Stick;1;*.mp3/*.ogg/*.wav/*.MP3/*.OGG/*.WAV/*.m3u/*.M3U/*.pls/*.PLS
diff --git a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-1.3.37.diff b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-1.3.37.diff
new file mode 100644
index 000000000000..7ea66ea4783a
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-1.3.37.diff
@@ -0,0 +1,29 @@
+--- mp3ng-0.9.13-MKIV-pre3/mp3ng.c	2006-02-04 18:26:38.505453250 +0100
++++ mp3ng-0.9.13-MKIV-pre3/mp3ng.vdr-1.3.37.c	2006-02-04 18:31:18.342942000 +0100
+@@ -280,7 +280,7 @@
+   framesPerSecond=SecondsToFrames(1);
+   if(!osd) osd=0;
+   font=cFont::GetFont(fontOsd);
+-  cStatus::MsgReplaying(this,"MP3");
++  cStatus::MsgReplaying(this,"MP3",0,true);
+   
+   
+   clrBackground			= mp3Theme[MP3Setup.osdtheme].clrBackground;
+@@ -307,7 +307,7 @@
+ 
+ void cMP3Control::Stop(void)
+ {
+-  cStatus::MsgReplaying(this,0);
++  cStatus::MsgReplaying(this,"MP3",0,false);
+   delete player; player=0;
+   mgr->Halt();
+   mgr->Flush(); //XXX remove later
+@@ -559,7 +559,7 @@
+       if(changed || mode->Loop!=lastMode->Loop || mode->Shuffle!=lastMode->Shuffle) {
+         snprintf(buf,sizeof(buf),mode->Artist[0]?"[%c%c] (%d/%d) %s - %s":"[%c%c] (%d/%d) %s",
+                   mode->Loop?'L':'.',mode->Shuffle?'S':'.',mode->Num,mode->MaxNum,mode->Title,mode->Artist);
+-        cStatus::MsgReplaying(this,buf);
++        cStatus::MsgReplaying(this,"MP3",buf,true);
+         }
+       }
+ 
diff --git a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-gcc4.diff b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-gcc4.diff
new file mode 100644
index 000000000000..16abbd9dc10f
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-gcc4.diff
@@ -0,0 +1,17 @@
+Nur in mp3ng-0.9.13-MKIV-pre3: decoder.o.
+diff -ru mp3ng-0.9.13-MKIV-pre3-orig/decoder-ogg.h mp3ng-0.9.13-MKIV-pre3/decoder-ogg.h
+--- mp3ng-0.9.13-MKIV-pre3-orig/decoder-ogg.h	2006-07-08 21:19:14.777181805 +0200
++++ mp3ng-0.9.13-MKIV-pre3/decoder-ogg.h	2006-07-08 21:19:31.498835576 +0200
+@@ -49,7 +49,7 @@
+   ~cOggFile();
+   bool Open(bool log=true);
+   void Close(void);
+-  long long cOggFile::Seek(long long posMs=0, bool relativ=false);
++  long long Seek(long long posMs=0, bool relativ=false);
+   int Stream(short *buffer, int samples);
+   bool CanSeek(void) { return canSeek; }
+   long long IndexMs(void);
+Nur in mp3ng-0.9.13-MKIV-pre3: decoder-ogg.o.
+Nur in mp3ng-0.9.13-MKIV-pre3: decoder-snd.o.
+Nur in mp3ng-0.9.13-MKIV-pre3: libvdr-mp3ng.so.
+Nur in mp3ng-0.9.13-MKIV-pre3: libvdr-mp3ng.so.1.4.1.
diff --git a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-gentoo.diff b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-gentoo.diff
new file mode 100644
index 000000000000..be3b3442ef04
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-gentoo.diff
@@ -0,0 +1,31 @@
+--- mp3ng.c	2005-11-21 12:54:36.000000000 +0100
++++ mp3ng-gentoo.c	2005-12-20 10:29:24.070051500 +0100
+@@ -1775,10 +1775,10 @@
+ {
+   if(!CheckVDRVersion(1,1,29,"mp3ng")) return false;
+   i18n_name=Name();
+-  MP3Sources.Load(AddDirectory(ConfigDirectory(),"mp3sources.conf"));
++  MP3Sources.Load(AddDirectory(ConfigDirectory(),"mp3ng/mp3ngsources"));
+   if(MP3Sources.Count()<1) {
+-     esyslog("ERROR: you should have defined at least one source in mp3sources.conf");
+-     fprintf(stderr,"No source(s) defined in mp3sources.conf\n");
++     esyslog("ERROR: you should have defined at least one source in mp3ngsources");
++     fprintf(stderr,"No source(s) defined in mp3ngsources\n");
+      return false;
+      }
+   InfoCache.Load();
+
+--- player-mp3.c	2005-11-15 23:15:41.000000000 +0100
++++ player-mp3-gentoo.c	2006-01-04 01:39:21.178251500 +0100
+@@ -2073,9 +2073,9 @@
+ 
+   if (!strlen (coverpicture)) {
+       if (!isStream)
+-        strcpy(coverpicture, "/var/cache/images/mp3MKIV-defaultcover.jpg");
++        strcpy(coverpicture, "/usr/share/vdr/mp3ng/mp3MKIV-defaultcover.jpg");
+       else
+-        strcpy(coverpicture, "/var/cache/images/mp3MKIV-streamcover.jpg");
++        strcpy(coverpicture, "/usr/share/vdr/mp3ng/mp3MKIV-streamcover.jpg");
+       }
+ 
+ //  printf("DEBUG 101b: cover = %s\n", imageFile);
diff --git a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-glibc-2.10.patch b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-glibc-2.10.patch
new file mode 100644
index 000000000000..7965c8212bea
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-glibc-2.10.patch
@@ -0,0 +1,78 @@
+diff -ur mp3ng-0.9.13-MKIV-pre3.orig/data.c mp3ng-0.9.13-MKIV-pre3/data.c
+--- mp3ng-0.9.13-MKIV-pre3.orig/data.c	2005-08-28 19:18:06.000000000 +0300
++++ mp3ng-0.9.13-MKIV-pre3/data.c	2009-08-09 22:25:33.000000000 +0300
+@@ -408,7 +408,7 @@
+   description=strdup(Description);
+   if(Include) {
+     do {
+-      char *s=index(Include,'/');
++      char *s=const_cast<char*> (index(Include,'/'));
+       int l=s ? s-Include : strlen(Include);
+       if(l) {
+         char **s=(char **)realloc(include,(incCount+2)*sizeof(char *));
+diff -ur mp3ng-0.9.13-MKIV-pre3.orig/decoder.c mp3ng-0.9.13-MKIV-pre3/decoder.c
+--- mp3ng-0.9.13-MKIV-pre3.orig/decoder.c	2005-08-28 19:18:06.000000000 +0300
++++ mp3ng-0.9.13-MKIV-pre3/decoder.c	2009-08-09 22:28:03.000000000 +0300
+@@ -101,7 +101,7 @@
+ {
+   // if no title, try to build a reasonable from the filename
+   if(!Title && filename)  {
+-    char *s=rindex(filename,'/');
++    char *s=const_cast<char*> (rindex(filename,'/'));
+     if(s && *s=='/') {
+       s++;
+       Title=strdup(s);
+diff -ur mp3ng-0.9.13-MKIV-pre3.orig/decoder-ogg.c mp3ng-0.9.13-MKIV-pre3/decoder-ogg.c
+--- mp3ng-0.9.13-MKIV-pre3.orig/decoder-ogg.c	2005-05-31 19:56:24.000000000 +0300
++++ mp3ng-0.9.13-MKIV-pre3/decoder-ogg.c	2009-08-09 22:31:17.000000000 +0300
+@@ -161,7 +161,7 @@
+     for(int i=0 ; i<vc->comments ; i++) {
+       const char *cc=vc->user_comments[i];
+       d(printf("ogg: comment%d='%s'\n",i,cc))
+-      char *p=strchr(cc,'=');
++      const char *p=strchr(cc,'=');
+       if(p) {
+         const int len=p-cc;
+         p++;
+diff -ur mp3ng-0.9.13-MKIV-pre3.orig/decoder-snd.c mp3ng-0.9.13-MKIV-pre3/decoder-snd.c
+--- mp3ng-0.9.13-MKIV-pre3.orig/decoder-snd.c	2005-05-31 19:56:11.000000000 +0300
++++ mp3ng-0.9.13-MKIV-pre3/decoder-snd.c	2009-08-09 22:30:38.000000000 +0300
+@@ -577,7 +577,7 @@
+ bool cCDDBDisc::Split(const char *source, char div, char * &first, char * &second, bool only3)
+ {
+   int pos=-1, n=0;
+-  char *p, l[4]={ ' ',div,' ',0 };
++  const char *p, l[4]={ ' ',div,' ',0 };
+   if ((p=strstr(source,l))) { pos=p-source; n=3; }
+   else if(!only3 && (p=strchr(source,div)))  { pos=p-source; n=1; }
+   if(pos>=0) {
+@@ -857,7 +857,7 @@
+ {
+   if(id->Get()) {
+     int tr;
+-    char *s=strstr(filename,CDFS_TRACK);
++    char *s=const_cast<char*> (strstr(filename,CDFS_TRACK));
+     if(s && sscanf(s+strlen(CDFS_TRACK),"%d",&tr)==1) {
+       d(printf("snd: looking up disc id %08x track %d\n",id->discid,tr))
+       return cddb.Lookup(id,tr-1,this);
+diff -ur mp3ng-0.9.13-MKIV-pre3.orig/stream.c mp3ng-0.9.13-MKIV-pre3/stream.c
+--- mp3ng-0.9.13-MKIV-pre3.orig/stream.c	2005-02-06 13:14:43.000000000 +0200
++++ mp3ng-0.9.13-MKIV-pre3/stream.c	2009-08-09 22:27:20.000000000 +0300
+@@ -386,7 +386,7 @@
+ 
+ bool cNetStream::ParseHeader(const char *buff, const char *name, char **value)
+ {
+-  char *s=index(buff,':');
++  char *s=const_cast<char*> (index(buff,':'));
+   if(s && !strncasecmp(buff,name,s-buff)) {
+     s=skipspace(s+1);
+     d(printf("netstream: found header '%s' contents '%s'\n",name,s))
+@@ -510,7 +510,7 @@
+ 
+ char *cNetStream::ParseMetaString(const char *buff, const char *name, char **value)
+ {
+-  char *s=index(buff,'=');
++  char *s=const_cast<char*> (index(buff,'='));
+   if(s && !strncasecmp(buff,name,s-buff)) {
+     char *end=index(s+2,'\'');
+     if(s[1]=='\'' && end) {
diff --git a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff
new file mode 100644
index 000000000000..e9c1d8ceb425
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff
@@ -0,0 +1,62 @@
+fix for VDR 1.5.x
+
+Joerg Bornkessel <hd_brummy@gentoo.org> 25 Mar 2007
+diff -Naur mp3ng-0.9.13-MKIV-pre3.orig/mp3ng.c mp3ng-0.9.13-MKIV-pre3/mp3ng.c
+--- mp3ng-0.9.13-MKIV-pre3.orig/mp3ng.c	2007-03-25 23:09:14.000000000 +0200
++++ mp3ng-0.9.13-MKIV-pre3/mp3ng.c	2007-03-25 23:14:16.000000000 +0200
+@@ -370,7 +370,12 @@
+   HideStatus();
+   if(visible) {
+     delete osd; osd=0;
++#if APIVERSNUM > 10500
++       visible=bigwin=false;
++       SetNeedsFastResponse(visible);
++#else
+     needsFastResponse=visible=bigwin=false;
++#endif
+     }
+ }
+ 
+@@ -581,7 +586,12 @@
+       osd->Flush();
+ 
+       ShowStatus(true);
++#if APIVERSNUM > 10500
++      visible=true;
++      SetNeedsFastResponse(visible);
++#else
+       needsFastResponse=visible=true;
++#endif
+       fliptime=listtime=0; flipint=0; flip=-1; top=lastTop=-1; lastIndex=lastTotal=-1;
+       delete lastMode; lastMode=0;
+       }
+diff -Naur mp3ng-0.9.13-MKIV-pre3.orig/mplayer.c mp3ng-0.9.13-MKIV-pre3/mplayer.c
+--- mp3ng-0.9.13-MKIV-pre3.orig/mplayer.c	2007-03-25 23:09:14.000000000 +0200
++++ mp3ng-0.9.13-MKIV-pre3/mplayer.c	2007-03-25 23:18:09.000000000 +0200
+@@ -219,7 +219,12 @@
+ #else
+     Interface->Close();
+ #endif
++#if APIVERSNUM > 10500
++    visible = modeOnly = false;
++    SetNeedsFastResponse(visible);
++#else
+     needsFastResponse=visible=modeOnly=false;
++#endif
+     }
+ }
+ 
+@@ -251,7 +256,13 @@
+       Interface->Clear();
+       if(MPlayerSetup.OsdPos>0) Interface->Fill(0,3,Interface->Width(),MPlayerSetup.OsdPos,clrTransparent);
+ #endif
++#if APIVERSNUM > 10500
++      visible = true;
++      SetNeedsFastResponse(visible);
++      modeOnly=false;
++#else
+       needsFastResponse=visible=true; modeOnly=false;
++#endif
+       if(file) {
+ #if VDRVERSNUM >= 10307
+         display->SetTitle(file->Path());
diff --git a/media-plugins/vdr-mp3ng/metadata.xml b/media-plugins/vdr-mp3ng/metadata.xml
new file mode 100644
index 000000000000..0b68056b5a3b
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>vdr@gentoo.org</email>
+  <name>Gentoo VDR Project</name>
+  <description>
+	Please contacts maintainer before you something change.
+  </description>
+</maintainer>
+  <longdescription>VDR Plugin to play audio files, supports mp3, wav and ogg audio format.
+				  You can provide and edit your own playlists.
+  </longdescription>
+</pkgmetadata>
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r1.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r1.ebuild
new file mode 100644
index 000000000000..da4eb768f836
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vdr-plugin-2 flag-o-matic
+
+MY_PV=0.9.13-MKIV-pre3
+MY_P=${PN}-${MY_PV}
+
+S=${WORKDIR}/mp3ng-0.9.13-MKIV-pre3
+
+DESCRIPTION="VDR Plugin: play mp3 and ogg on VDR"
+HOMEPAGE="http://www.glaserei-franz.de/VDR/Moronimo2/vdrplugins.htm"
+SRC_URI="http://www.glaserei-franz.de/VDR/Moronimo2/downloads/${MY_P}.tar.gz
+		mirror://gentoo/${PN}-pictures-0.0.1.tar.gz
+		mirror://gentoo/${PN}-0.0.1_pre4-span-0.0.3.diff.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vorbis oss imagemagick"
+
+DEPEND=">=media-video/vdr-1.6
+	media-libs/libmad
+	media-libs/libid3tag
+	sys-libs/zlib
+	media-libs/libsndfile
+	vorbis? ( media-libs/libvorbis )
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( media-libs/imlib2 )"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# wrt bug 595248
+	append-cxxflags $(test-flags-CXX -std=gnu++03) -std=gnu++03
+
+	epatch "${FILESDIR}/${PN}-0.0.1_pre4-gentoo.diff"
+	epatch "${FILESDIR}/${PN}-0.0.1_pre4-gcc4.diff"
+	epatch "${DISTDIR}/${PN}-0.0.1_pre4-span-0.0.3.diff.tar.gz"
+	epatch "${FILESDIR}/${PN}-0.0.1_pre4-vdr-1.5.1.diff"
+	epatch "${FILESDIR}/${PN}-0.0.1_pre4-glibc-2.10.patch"
+
+	use !vorbis && sed -i "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" Makefile
+	use oss && sed -i "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" Makefile
+	use imagemagick && sed -i Makefile \
+		-e "s:HAVE_IMLIB2:#HAVE_IMLIB2:" \
+		-e "s:#HAVE_MAGICK:HAVE_MAGICK:"
+
+	has_version ">=media-video/vdr-1.3.37" && epatch "${FILESDIR}/${PN}-0.0.1_pre4-1.3.37.diff"
+	has_version ">=media-gfx/imagemagick-6.4" && epatch "${FILESDIR}/imagemagick-6.4.x.diff"
+
+	sed -i mp3ng.c -e "s:RegisterI18n:// RegisterI18n:"
+
+	if has_version ">=media-video/vdr-2.1.2"; then
+		sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" -i decoder.c
+	fi
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /etc/vdr/plugins/mp3ng
+	doins	"${FILESDIR}/mp3ngsources"
+
+	insinto /usr/share/vdr/mp3ng
+	doins "${WORKDIR}/${PN}-pictures-0.0.1"/*.jpg
+	doins "${S}/images/mp3MKIV-spectrum-analyzer-bg.png"
+
+	newbin examples/mount.sh.example mount-mp3ng.sh
+
+	dodoc HISTORY MANUAL README README-MORONIMO examples/network.sh.example
+}