version bump

(Portage version: 2.1.1)

5 files changed, 119 insertions, 1 deletions

diff --git a/media-plugins/vdr-mplayer/ChangeLog b/media-plugins/vdr-mplayer/ChangeLog
index 110e6bd607a2..b3888d5faef3 100644
--- a/media-plugins/vdr-mplayer/ChangeLog
+++ b/media-plugins/vdr-mplayer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-mplayer
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.7 2006/09/08 09:12:44 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/ChangeLog,v 1.8 2006/09/22 22:33:13 hd_brummy Exp $
+
+*vdr-mplayer-0.9.15 (22 Sep 2006)
+
+  22 Sep 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-mplayer-0.9.15-gentoo.diff,
+  +files/vdr-mplayer-0.9.15-slave-mode-default.diff,
+  +vdr-mplayer-0.9.15.ebuild:
+  version bump
 
   08 Sep 2006; Matthias Schwarzott <zzam@gentoo.org>
   vdr-mplayer-0.9.14-r2.ebuild:
diff --git a/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.15 b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.15
new file mode 100644
index 000000000000..efcf6709e518
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/digest-vdr-mplayer-0.9.15
@@ -0,0 +1,3 @@
+MD5 e1c78a10d65f6422555b4755f2f634de vdr-mp3-0.9.15.tar.gz 123718
+RMD160 5ab5404a3c2df45df45588d33cde5ae11a433998 vdr-mp3-0.9.15.tar.gz 123718
+SHA256 1c3ae584c46d41661dd320f76938fe05fd1801f53537d7e08479a13243eca3c4 vdr-mp3-0.9.15.tar.gz 123718
diff --git a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-gentoo.diff b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-gentoo.diff
new file mode 100644
index 000000000000..ae52fe7c71f1
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-gentoo.diff
@@ -0,0 +1,36 @@
+fix some path for gentoo install
+
+Joerg Bornkessel <hd_brummy@gentoo.org>
+diff -Naur mp3-0.9.15.orig/Makefile mp3-0.9.15/Makefile
+--- mp3-0.9.15.orig/Makefile	2006-09-22 20:02:06.484888703 +0200
++++ mp3-0.9.15/Makefile	2006-09-22 20:03:09.732841453 +0200
+@@ -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.9.15.orig/mplayer.c mp3-0.9.15/mplayer.c
+--- mp3-0.9.15.orig/mplayer.c	2006-09-22 20:02:06.504889953 +0200
++++ mp3-0.9.15/mplayer.c	2006-09-22 20:06:46.998419703 +0200
+@@ -814,7 +814,7 @@
+ {
+   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/vdr-mplayer-0.9.15-slave-mode-default.diff b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-slave-mode-default.diff
new file mode 100644
index 000000000000..54a6c523b11c
--- /dev/null
+++ b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.9.15-slave-mode-default.diff
@@ -0,0 +1,16 @@
+set slave mode on OSD to default
+
+Joerg Bornkessel <hd_brummy@gentoo.org>
+
+diff -ru mp3-0.9.14-orig/setup-mplayer.c mp3-0.9.14/setup-mplayer.c
+--- mp3-0.9.14-orig/setup-mplayer.c	2006-07-07 09:56:27.000000000 +0200
++++ mp3-0.9.14/setup-mplayer.c	2006-07-07 09:56:35.000000000 +0200
+@@ -30,7 +30,7 @@
+ 
+ cMPlayerSetup::cMPlayerSetup(void)
+ {
+-  SlaveMode = 0;
++  SlaveMode = 1;
+   ResumeMode = 2;
+   HideMainMenu = 0;
+   OsdPos = 0;
diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild
new file mode 100644
index 000000000000..cd42f07a4b2b
--- /dev/null
+++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mplayer/vdr-mplayer-0.9.15.ebuild,v 1.1 2006/09/22 22:33:13 hd_brummy Exp $
+
+inherit vdr-plugin eutils
+
+DESCRIPTION="Video Disk Recorder Mplayer Plugin"
+HOMEPAGE="http://www.muempf.de/"
+SRC_URI="http://www.muempf.de/down/vdr-mp3-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.2.6"
+
+RDEPEND="${DEPEND}
+		>=media-video/mplayer-0.90_rc4
+		>=media-video/mplayer-sh-0.8.6-r1
+		sys-apps/eject"
+
+S=${WORKDIR}/mp3-${PV}
+
+PATCHES="${FILESDIR}/${P}-gentoo.diff
+		${FILESDIR}/${P}-slave-mode-default.diff"
+
+src_install() {
+
+	vdr-plugin_src_install
+
+	insinto /etc/vdr/plugins/mplayer
+	doins   ${FILESDIR}/mplayersources.conf
+
+	into /usr/share/vdr/mplayer
+	newbin examples/mount.sh.example mount-mplayer.sh
+
+	dodoc HISTORY MANUAL README examples/{image_convert,network}.sh.example
+}
+
+pkg_postinst() {
+
+	vdr-plugin_pkg_postinst
+
+	echo
+	einfo "Edit all config's /etc/vdr/plugins/mplayer"
+	echo
+
+	if ! has_version "media-plugins/vdr-mp3ng" ; then
+		einfo "Splitted ebuild!, no support for Audio files"
+		einfo "To play mp3, ogg and wav files,"
+		einfo "emerge media-plugins/vdr-mp3ng -pv"
+		echo
+	fi
+}