reinit the tree, so we can have metadata

4 files changed, 98 insertions, 0 deletions

diff --git a/media-plugins/vdr-dvd/files/confd b/media-plugins/vdr-dvd/files/confd
new file mode 100644
index 000000000000..6dc484c2f831
--- /dev/null
+++ b/media-plugins/vdr-dvd/files/confd
@@ -0,0 +1,18 @@
+# /etc/conf.d/vdr.dvd:
+
+# Global config file for vdr rc-scripts
+
+# The plugin uses libdvdcss to access CSS protected DVDs. 
+# (Note: doing so might be illegal in some countries).
+#
+#	allowed values: yes|no
+#	default: no
+#DVD_DVDCSS="no"
+
+# By default VDR expects the DVD drive to be located at 
+# /dev/dvd (which typically is a symbolic link to the 
+# actual device, for instance /dev/hdc).
+#
+#   allowed values: device names
+#   default: /dev/dvd
+#DVD_DRIVE="/dev/dvd"
diff --git a/media-plugins/vdr-dvd/files/rc-addon.sh b/media-plugins/vdr-dvd/files/rc-addon.sh
new file mode 100644
index 000000000000..000640ebdc90
--- /dev/null
+++ b/media-plugins/vdr-dvd/files/rc-addon.sh
@@ -0,0 +1,15 @@
+#
+# rc-addon plugin-startup-skript for vdr-dvd
+#
+
+plugin_pre_vdr_start() {
+
+	: ${DVD_DRIVE:=/dev/dvd}
+
+	add_plugin_param "-C${DVD_DRIVE}"
+	add_plugin_param "--dvd=${DVD_DRIVE}"
+
+	if [ "${DVD_DVDCSS:=no}" = "yes" ]; then
+		export DVDCSS_METHOD=key
+	fi
+}
diff --git a/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-compile_warnings.diff b/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-compile_warnings.diff
new file mode 100644
index 000000000000..70f5bfdf9c30
--- /dev/null
+++ b/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-compile_warnings.diff
@@ -0,0 +1,47 @@
+fixe a lot of compile warnings,...
+
+Signed of by: Joerg Bornkessel <hd_brummy@gentoo.org> (26 Jan 2011)
+
+diff -Naur dvd-cvs-20090106.orig/player-dvd.c dvd-cvs-20090106/player-dvd.c
+--- dvd-cvs-20090106.orig/player-dvd.c	2011-01-26 15:49:38.000000000 +0100
++++ dvd-cvs-20090106/player-dvd.c	2011-01-26 15:54:07.000000000 +0100
+@@ -2670,18 +2670,18 @@
+ 
+     //Menu's has no titleNumbers and chapterNumbers (see dvdnav.h)
+     if (titleNumber == 0)
+-        asprintf(&titleinfo_str, "%d/%d %d", titleNumber, titleNumbers,  chapterNumber);
++        (0 < asprintf(&titleinfo_str, "%d/%d %d", titleNumber, titleNumbers,  chapterNumber));
+     else if (angleNumbers > 1)
+-        asprintf(&titleinfo_str, "%d/%d %d/%d %d/%d", titleNumber, titleNumbers, chapterNumber, chapterNumbers, angleNumber, angleNumbers);
++        (0 < asprintf(&titleinfo_str, "%d/%d %d/%d %d/%d", titleNumber, titleNumbers, chapterNumber, chapterNumbers, angleNumber, angleNumbers));
+     else
+-        asprintf(&titleinfo_str, "%d/%d %d/%d", titleNumber, titleNumbers,  chapterNumber, chapterNumbers);
++        (0 < asprintf(&titleinfo_str, "%d/%d %d/%d", titleNumber, titleNumbers,  chapterNumber, chapterNumbers));
+     return;
+ }
+ 
+ void cDvdPlayer::GetAudioLanguageStr(const char **AudioLanguageStr) const
+ {
+ 	static char buffer[100];
+-	char *audioTypeDescr = NULL;
++	const char *audioTypeDescr = NULL;
+ 
+     if (!DVDActiveAndRunning()) {
+         *AudioLanguageStr = "n.a.";
+@@ -2753,13 +2753,13 @@
+ 
+     switch (dvdnav_get_video_aspect(nav)) {
+         case 0:
+-            asprintf(&aspect_str, " 4:3");
++            (0 < asprintf(&aspect_str, " 4:3"));
+             break;
+         case 2:
+-            asprintf(&aspect_str, "16:9_");
++            (0 < asprintf(&aspect_str, "16:9_"));
+             break;
+         case 3:
+-            asprintf(&aspect_str, "16:9");
++            (0 < asprintf(&aspect_str, "16:9"));
+             break;
+         default:
+             aspect_str = strdup(dummy_n_a);
diff --git a/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-fix-dvdnav-using-c++-keywords.patch b/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-fix-dvdnav-using-c++-keywords.patch
new file mode 100644
index 000000000000..237ad1876458
--- /dev/null
+++ b/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-fix-dvdnav-using-c++-keywords.patch
@@ -0,0 +1,18 @@
+Description: When including dvdnvav.h define/undefine the "this" keyword,
+ used in dvdnav.h
+Author: Tobias Grimm <etobi@debian.org>
+Bug-Debian: http://bugs.debian.org/642673
+
+--- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/player-dvd.h
++++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.h
+@@ -11,8 +11,10 @@
+ #ifndef __PLAYER_DVD_H
+ #define __PLAYER_DVD_H
+ 
++#define this _this
+ #include <dvdnav/dvdnav.h>
+ #include <dvdnav/dvdnav_events.h>
++#undef this
+ 
+ #include <vdr/device.h>
+ #include <vdr/player.h>