Version bumped. Now use a use-dependency to guarantee xine-lib has USE=vdr.

(Portage version: 2.1.6.6/svn/Linux 2.6.27-gentoo-r1 i686)

svn path=/testing/; revision=498

4 files changed, 102 insertions, 6 deletions

diff --git a/media-plugins/vdr-xine/ChangeLog b/media-plugins/vdr-xine/ChangeLog
index ca2016f..0dd6e20 100644
--- a/media-plugins/vdr-xine/ChangeLog
+++ b/media-plugins/vdr-xine/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for media-plugins/vdr-xine
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Jan 2009; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-xine-0.9.0-gentoo.diff, metadata.xml, +vdr-xine-0.9.0.ebuild:
+  Version bumped. Now use a use-dependency to guarantee xine-lib has
+  USE=vdr.
+
   01 Apr 2008; Matthias Schwarzott <zzam@gentoo.org> +vdr-xine-0.8.2.ebuild:
   Version bumped.
 
diff --git a/media-plugins/vdr-xine/files/vdr-xine-0.9.0-gentoo.diff b/media-plugins/vdr-xine/files/vdr-xine-0.9.0-gentoo.diff
new file mode 100644
index 0000000..f1bf6f3
--- /dev/null
+++ b/media-plugins/vdr-xine/files/vdr-xine-0.9.0-gentoo.diff
@@ -0,0 +1,24 @@
+diff -ru xine-0.9.0-orig/Makefile xine-0.9.0/Makefile
+--- xine-0.9.0-orig/Makefile	2009-01-18 17:40:13.228935882 +0100
++++ xine-0.9.0/Makefile	2009-01-18 17:40:39.315595879 +0100
+@@ -37,7 +37,7 @@
+ INCLUDES += `pkg-config --cflags libxine` 
+ 
+ # where to create fifos (xine expects them at /tmp/vdr-xine)
+-VDR_XINE_FIFO_DIR ?= /tmp/vdr-xine
++VDR_XINE_FIFO_DIR ?= /var/vdr/xine
+ 
+ # can be used to detect inefficient OSD drawing
+ # 0 - do not verify whether the dirty area of a bitmap is really dirty
+diff -ru xine-0.9.0-orig/xineLib.c xine-0.9.0/xineLib.c
+--- xine-0.9.0-orig/xineLib.c	2009-01-18 17:40:13.228935882 +0100
++++ xine-0.9.0/xineLib.c	2009-01-18 17:41:28.815595331 +0100
+@@ -2118,7 +2118,7 @@
+ 
+   bool cXineLib::readNoSignalStream(const int index, const string &suffix)
+   {
+-    string noSignalFileName = m_plugin->ConfigDirectory(PLUGIN_NAME_I18N);
++    string noSignalFileName = "/usr/share/vdr/xine";
+ //    noSignalFileName += "/noSignal.pes";
+     noSignalFileName += "/noSignal" + suffix + ".mpg";
+ 
diff --git a/media-plugins/vdr-xine/metadata.xml b/media-plugins/vdr-xine/metadata.xml
index 5f9f146..02cb730 100644
--- a/media-plugins/vdr-xine/metadata.xml
+++ b/media-plugins/vdr-xine/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-<maintainer>
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
+  <herd>media-tv</herd>
+  <maintainer>
+    <email>vdr@gentoo.org</email>
+    <name>Gentoo VDR Project</name>
+  </maintainer>
+  <use>
+    <flag name="vdr-net">use network connection to VDR instead of local socket</flag>
+    <flag name="yaepg">Enables support for the plugin vdr-yaepg (showing scaled video besides OSD)</flag>
+  </use>
 </pkgmetadata>
 
diff --git a/media-plugins/vdr-xine/vdr-xine-0.9.0.ebuild b/media-plugins/vdr-xine/vdr-xine-0.9.0.ebuild
new file mode 100644
index 0000000..c66caef
--- /dev/null
+++ b/media-plugins/vdr-xine/vdr-xine-0.9.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit vdr-plugin
+
+DESCRIPTION="VDR plugin: for 'software only' playback using xine"
+HOMEPAGE="http://home.vr-web.de/~rnissl/"
+SRC_URI="http://home.vr-web.de/~rnissl/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="yaepg"
+
+DEPEND=">=media-video/vdr-1.3.9
+	>=media-libs/xine-lib-1.1.8[vdr]"
+
+pkg_setup() {
+	vdr-plugin_pkg_setup
+
+	# we have use depend now, but better check it nevertheless :)
+	if [[ -f /usr/include/xine/vdr.h ]] ; then
+		einfo "detected vdr-patched xine-lib."
+	else
+		echo
+		eerror "detected unpatched xine-lib!"
+		echo
+		einfo "you need to reemerge xine-lib with use-flag vdr!"
+		einfo "you will find a VDR supported xine-lib ONLY on overlay vdr-testing"
+		die "you need to reemerge xine-lib with use-flag vdr!"
+	fi
+}
+
+src_unpack() {
+	vdr-plugin_src_unpack
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gentoo.diff"
+
+	use yaepg && sed -i Makefile -e "s:#VDR_XINE_SET_VIDEO_WINDOW:VDR_XINE_SET_VIDEO_WINDOW:"
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	dobin xineplayer
+
+	insinto /usr/share/vdr/xine
+	doins data/*
+}
+
+pkg_postinst() {
+	vdr-plugin_pkg_postinst
+
+	if [[ -d ${ROOT}/etc/vdr/plugins/xine ]]; then
+		ewarn "You have a leftover directory of vdr-xine."
+		ewarn "You can safely remove it with:"
+		ewarn "# rm -rf /etc/vdr/plugins/xine"
+	fi
+}