summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2014-01-08 14:57:19 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2014-01-08 14:57:19 +0000
commit2f939b2d6c16b5dfba33e1e5bf51a8984125fd41 (patch)
treee4781af7750915569ef1e27608029dce673cfa5b /media-plugins/vdr-mplayer/files
parentfixed epatch (diff)
downloadgentoo-2-2f939b2d6c16b5dfba33e1e5bf51a8984125fd41.tar.gz
gentoo-2-2f939b2d6c16b5dfba33e1e5bf51a8984125fd41.tar.bz2
gentoo-2-2f939b2d6c16b5dfba33e1e5bf51a8984125fd41.zip
cleanup; fixed compile with vdr-2.1.2, reported/tested by T.Eckert on vdrportal.de #post1179845
(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 34C2808A)
Diffstat (limited to 'media-plugins/vdr-mplayer/files')
-rw-r--r--media-plugins/vdr-mplayer/files/0.10.0/01_gentoo.diff38
-rw-r--r--media-plugins/vdr-mplayer/files/0.10.0/series1
-rw-r--r--media-plugins/vdr-mplayer/files/0.10.1/01_gentoo.diff33
3 files changed, 0 insertions, 72 deletions
diff --git a/media-plugins/vdr-mplayer/files/0.10.0/01_gentoo.diff b/media-plugins/vdr-mplayer/files/0.10.0/01_gentoo.diff
deleted file mode 100644
index 9e82ab14dab5..000000000000
--- a/media-plugins/vdr-mplayer/files/0.10.0/01_gentoo.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-fix some path for gentoo install
-
-Joerg Bornkessel <hd_brummy@gentoo.org>
-Index: mp3-0.10.0/Makefile
-===================================================================
---- mp3-0.10.0.orig/Makefile
-+++ mp3-0.10.0/Makefile
-@@ -22,14 +22,14 @@
- # in the VDR directory an set them there.
-
- ### uncomment one of these lines, if you don't want one of the plugins
--#WITHOUT_MP3=1
-+WITHOUT_MP3=1
- #WITHOUT_MPLAYER=1
-
- ### uncomment the following line, if you don't have libsndfile installed
--#WITHOUT_LIBSNDFILE=1
-+WITHOUT_LIBSNDFILE=1
-
- ### uncomment the following line, if you don't have libvorbisfile installed
--#WITHOUT_LIBVORBISFILE=1
-+WITHOUT_LIBVORBISFILE=1
-
- ### uncomment the following line, if you want OSS sound output
- #WITH_OSS_OUTPUT=1
-Index: mp3-0.10.0/mplayer.c
-===================================================================
---- mp3-0.10.0.orig/mplayer.c
-+++ mp3-0.10.0/mplayer.c
-@@ -825,7 +825,7 @@ bool cPluginMPlayer::Start(void)
- {
- if(!CheckVDRVersion(1,1,16,"mplayer")) return false;
- i18n_name=Name();
-- MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayersources.conf"));
-+ MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"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 --git a/media-plugins/vdr-mplayer/files/0.10.0/series b/media-plugins/vdr-mplayer/files/0.10.0/series
deleted file mode 100644
index 65a3f0ae0891..000000000000
--- a/media-plugins/vdr-mplayer/files/0.10.0/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gentoo.diff
diff --git a/media-plugins/vdr-mplayer/files/0.10.1/01_gentoo.diff b/media-plugins/vdr-mplayer/files/0.10.1/01_gentoo.diff
deleted file mode 100644
index 6eb95c7239ca..000000000000
--- a/media-plugins/vdr-mplayer/files/0.10.1/01_gentoo.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur mp3-0.10.1.orig/Makefile mp3-0.10.1/Makefile
---- mp3-0.10.1.orig/Makefile 2008-03-02 16:58:40.988974674 +0100
-+++ mp3-0.10.1/Makefile 2008-03-02 16:59:36.879557750 +0100
-@@ -24,14 +24,14 @@
- # in the VDR directory an set them there.
-
- ### uncomment one of these lines, if you don't want one of the plugins
--#WITHOUT_MP3=1
-+WITHOUT_MP3=1
- #WITHOUT_MPLAYER=1
-
- ### uncomment the following line, if you don't have libsndfile installed
--#WITHOUT_LIBSNDFILE=1
-+WITHOUT_LIBSNDFILE=1
-
- ### uncomment the following line, if you don't have libvorbisfile installed
--#WITHOUT_LIBVORBISFILE=1
-+WITHOUT_LIBVORBISFILE=1
-
- ### uncomment the following line, if you want OSS sound output
- #WITH_OSS_OUTPUT=1
-diff -Naur mp3-0.10.1.orig/mplayer.c mp3-0.10.1/mplayer.c
---- mp3-0.10.1.orig/mplayer.c 2008-03-02 16:58:41.068960305 +0100
-+++ mp3-0.10.1/mplayer.c 2008-03-02 17:00:53.845333952 +0100
-@@ -832,7 +832,7 @@
- #else
- i18n_name="vdr-mplayer";
- #endif
-- MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayersources.conf"));
-+ MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"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");