summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-plugins/vdr-mp3ng/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-plugins/vdr-mp3ng/files')
-rw-r--r--media-plugins/vdr-mp3ng/files/confd32
-rw-r--r--media-plugins/vdr-mp3ng/files/imagemagick-6.4.x.diff13
-rw-r--r--media-plugins/vdr-mp3ng/files/mp3ngsources3
-rw-r--r--media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-1.3.37.diff29
-rw-r--r--media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-gcc4.diff17
-rw-r--r--media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-gentoo.diff31
-rw-r--r--media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-glibc-2.10.patch78
-rw-r--r--media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre4-vdr-1.5.1.diff62
8 files changed, 265 insertions, 0 deletions
diff --git a/media-plugins/vdr-mp3ng/files/confd b/media-plugins/vdr-mp3ng/files/confd
new file mode 100644
index 000000000000..138db4127758
--- /dev/null
+++ b/media-plugins/vdr-mp3ng/files/confd
@@ -0,0 +1,32 @@
+# $Id$
+
+# 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());