-

(Portage version: 2.1.4.5)

4 files changed, 7 insertions, 78 deletions

diff --git a/media-plugins/vdr-mp3ng/ChangeLog b/media-plugins/vdr-mp3ng/ChangeLog
index ad365b262811..6a731e1988b5 100644
--- a/media-plugins/vdr-mp3ng/ChangeLog
+++ b/media-plugins/vdr-mp3ng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-mp3ng
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.14 2008/10/25 11:18:13 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.15 2008/10/25 11:21:02 hd_brummy Exp $
+
+  25 Oct 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/vdr-mp3ng-0.0.1_pre3-1.3.37.diff,
+  -files/vdr-mp3ng-0.0.1_pre3-gcc4.diff,
+  -files/vdr-mp3ng-0.0.1_pre3-gentoo.diff:
+  -
 
   25 Oct 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
   +files/imagemagick-6.4.x.diff, -vdr-mp3ng-0.0.1_pre3.ebuild,
diff --git a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre3-1.3.37.diff b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre3-1.3.37.diff
deleted file mode 100644
index 7ea66ea4783a..000000000000
--- a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre3-1.3.37.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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_pre3-gcc4.diff b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre3-gcc4.diff
deleted file mode 100644
index 16abbd9dc10f..000000000000
--- a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre3-gcc4.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-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_pre3-gentoo.diff b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre3-gentoo.diff
deleted file mode 100644
index be3b3442ef04..000000000000
--- a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre3-gentoo.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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);