_pre3 x86 ; _pre4 include a patch, needed by vdr-span plugin

(Portage version: 2.1-r2)

8 files changed, 156 insertions, 4 deletions

diff --git a/media-plugins/vdr-mp3ng/ChangeLog b/media-plugins/vdr-mp3ng/ChangeLog
index d8e4ee27c4b5..2b733e92d56c 100644
--- a/media-plugins/vdr-mp3ng/ChangeLog
+++ b/media-plugins/vdr-mp3ng/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-plugins/vdr-mp3ng
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.7 2006/08/15 10:41:38 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.8 2006/09/09 21:15:07 hd_brummy Exp $
+
+*vdr-mp3ng-0.0.1_pre4 (09 Sep 2006)
+
+  09 Sep 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-mp3ng-0.0.1_pre4-1.3.37.diff,
+  +files/vdr-mp3ng-0.0.1_pre4-gcc4.diff,
+  +files/vdr-mp3ng-0.0.1_pre4-gentoo.diff,
+  +files/vdr-mp3ng-0.0.1_pre4-span.diff, vdr-mp3ng-0.0.1_pre3.ebuild,
+  +vdr-mp3ng-0.0.1_pre4.ebuild:
+  _pre3 x86 ; _pre4 include a patch, needed by vdr-span plugin
 
   15 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml:
   Assigned to Gentoo VDR Project.
diff --git a/media-plugins/vdr-mp3ng/files/digest-vdr-mp3ng-0.0.1_pre4 b/media-plugins/vdr-mp3ng/files/digest-vdr-mp3ng-0.0.1_pre4
new file mode 100644
index 000000000000..c80a64866e2a
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/files/digest-vdr-mp3ng-0.0.1_pre4
@@ -0,0 +1,6 @@
+MD5 266dd352da9b01c8d2c325f399076dfc vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz 128289
+RMD160 8ba70bc7054017e2fc6e7738f34604a444b4b5c1 vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz 128289
+SHA256 c92b220b878c98001bc6293aaa72d3247368a4d8c785e883f8fb24c4e4a09f12 vdr-mp3ng-0.9.13-MKIV-pre3.tar.gz 128289
+MD5 9d9eaba46085c01075fcff5e97bf46b0 vdr-mp3ng-pictures-0.0.1.tar.gz 170089
+RMD160 8a509f90dce9102ee5b39d1536aad0e31060a9c6 vdr-mp3ng-pictures-0.0.1.tar.gz 170089
+SHA256 962d3e85b3e19e7ef1bfdd4b66947b3c5327f5691c42454b4840fdb7ec5b2288 vdr-mp3ng-pictures-0.0.1.tar.gz 170089
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-span.diff b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-span.diff
new file mode 100644
index 000000000000..3435c8dd80b9
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-span.diff
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild
index 33f60999b26f..201d265010cd 100644
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild,v 1.3 2006/07/08 19:23:15 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild,v 1.4 2006/09/09 21:15:07 hd_brummy Exp $
 
 inherit vdr-plugin eutils
 
-MY_PV=${PV/0.0.1_pre3}0.9.13-MKIV-pre3
+MY_PV=0.9.13-MKIV-pre3
 MY_P=${PN}-${MY_PV}
 
 S=${WORKDIR}/mp3ng-0.9.13-MKIV-pre3
@@ -16,7 +16,7 @@ SRC_URI="http://www.glaserei-franz.de/VDR/Moronimo2/downloads/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 IUSE="vorbis oss imagemagick"
 
 DEPEND=">=media-video/vdr-1.2.6
diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild
new file mode 100644
index 000000000000..f751f74c047f
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre4.ebuild,v 1.1 2006/09/09 21:15:07 hd_brummy Exp $
+
+inherit vdr-plugin eutils
+
+MY_PV=0.9.13-MKIV-pre3
+MY_P=${PN}-${MY_PV}
+
+S=${WORKDIR}/mp3ng-0.9.13-MKIV-pre3
+
+DESCRIPTION="Plugin to 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="vorbis oss imagemagick"
+
+DEPEND=">=media-video/vdr-1.2.6
+		media-libs/libmad
+		media-libs/libid3tag
+		sys-libs/zlib
+		media-libs/libsndfile
+		vorbis? ( media-libs/libvorbis )
+		imagemagick? ( media-gfx/imagemagick )
+		!imagemagick? ( media-libs/imlib2 )"
+
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-gcc4.diff
+	epatch ${FILESDIR}/${P}-span.diff
+
+	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}/${P}-1.3.37.diff
+}
+
+src_install() {
+	vdr-plugin_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
+}