reinit the tree, so we can have metadata

7 files changed, 195 insertions, 0 deletions

diff --git a/media-plugins/vdr-live/files/confd b/media-plugins/vdr-live/files/confd
new file mode 100644
index 000000000000..b96f0696c08a
--- /dev/null
+++ b/media-plugins/vdr-live/files/confd
@@ -0,0 +1,8 @@
+# configuration of vdr-live
+
+# use this portnumber
+LIVE_PORT="8008"
+
+# bind to these IP addresses
+LIVE_BIND_IPS="127.0.0.1"
+
diff --git a/media-plugins/vdr-live/files/confd-0.2 b/media-plugins/vdr-live/files/confd-0.2
new file mode 100644
index 000000000000..bbbbcb5e9d42
--- /dev/null
+++ b/media-plugins/vdr-live/files/confd-0.2
@@ -0,0 +1,23 @@
+# configuration of media-plugins/vdr-live
+
+# for people who want more secure
+# with ssl access.
+#	on usage, you have to install vdr-live
+#	with USE="ssl"
+#
+#	SSL ADDRESS -->  https://<your-ip>:8443/
+#
+#	allowed values: yes no
+#	default: no
+#LIVE_USE_SSL="yes"
+
+# default given portnumber
+# only changes needed on problems
+#
+#LIVE_PORT="8008"
+#LIVE_SSL_PORT="8443"
+
+# bind to these IP addresses
+# default, your IP will automaticly detected
+#
+LIVE_BIND_IPS="127.0.0.1"
diff --git a/media-plugins/vdr-live/files/confd-0.3 b/media-plugins/vdr-live/files/confd-0.3
new file mode 100644
index 000000000000..cb1dce04dfb5
--- /dev/null
+++ b/media-plugins/vdr-live/files/confd-0.3
@@ -0,0 +1,29 @@
+# configuration of media-plugins/vdr-live
+
+# for people who want more secure
+# with ssl access.
+#	on usage, you have to install vdr-live
+#	with USE="ssl"
+#
+#	SSL ADDRESS -->  https://<your-ip>:8443/
+#
+#	allowed values: yes no
+#	default: no
+#LIVE_USE_SSL="yes"
+
+# default given portnumber
+# only changes needed on problems
+#
+#LIVE_PORT="8008"
+#LIVE_SSL_PORT="8443"
+
+# bind to these IP addresses
+# default, your IP will automaticly detected
+#
+LIVE_BIND_IPS="127.0.0.1"
+
+# for people who have epgimges
+# default: /var/cache/vdr/epgimges
+#
+# set this to your own path, if needed
+#EPGIMAGES_DIR=" "
diff --git a/media-plugins/vdr-live/files/rc-addon-0.2.sh b/media-plugins/vdr-live/files/rc-addon-0.2.sh
new file mode 100644
index 000000000000..54d37d795ea2
--- /dev/null
+++ b/media-plugins/vdr-live/files/rc-addon-0.2.sh
@@ -0,0 +1,25 @@
+#
+# zzam@g.o
+# hd_brummy@g.o
+
+
+plugin_pre_vdr_start() {
+	if [ "${LIVE_USE_SSL:=no}" = "yes" ]; then
+		if [ -n "${LIVE_SSL_PORT}" ]; then
+			add_plugin_param "-s ${LIVE_SSL_PORT}"
+		fi
+
+		add_plugin_param "--cert=/etc/vdr/plugins/live/live.pem"
+		add_plugin_param "--key=/etc/vdr/plugins/live/live-key.pem"
+
+	else
+		if [ -n "${LIVE_PORT}" ]; then
+			add_plugin_param "-p ${LIVE_PORT}"
+		fi
+	fi
+
+	local ip
+	for ip in ${LIVE_BIND_IPS:=`hostname -i`}; do
+		add_plugin_param "-i ${ip}"
+	done
+}
diff --git a/media-plugins/vdr-live/files/rc-addon-0.3.sh b/media-plugins/vdr-live/files/rc-addon-0.3.sh
new file mode 100644
index 000000000000..1372e09d56f0
--- /dev/null
+++ b/media-plugins/vdr-live/files/rc-addon-0.3.sh
@@ -0,0 +1,30 @@
+#
+# zzam@g.o
+# hd_brummy@g.o
+
+EPGIMAGES_DIR="/var/cache/vdr/epgimages"
+
+plugin_pre_vdr_start() {
+	if [ "${LIVE_USE_SSL:=no}" = "yes" ]; then
+		if [ -n "${LIVE_SSL_PORT}" ]; then
+			add_plugin_param "-s ${LIVE_SSL_PORT}"
+		fi
+
+		add_plugin_param "--cert=/etc/vdr/plugins/live/live.pem"
+		add_plugin_param "--key=/etc/vdr/plugins/live/live-key.pem"
+
+	else
+		if [ -n "${LIVE_PORT}" ]; then
+			add_plugin_param "-p ${LIVE_PORT}"
+		fi
+	fi
+
+	if [ -d ${EPGIMAGES_DIR} ]; then
+		add_plugin_param "--epgimages=${EPGIMAGES_DIR}"
+	fi
+
+	local ip
+	for ip in ${LIVE_BIND_IPS:=`hostname -i`}; do
+		add_plugin_param "-i ${ip}"
+	done
+}
diff --git a/media-plugins/vdr-live/files/rc-addon.sh b/media-plugins/vdr-live/files/rc-addon.sh
new file mode 100644
index 000000000000..f637736d49b2
--- /dev/null
+++ b/media-plugins/vdr-live/files/rc-addon.sh
@@ -0,0 +1,11 @@
+plugin_pre_vdr_start() {
+	if [ -n "${LIVE_PORT}" ]; then
+		add_plugin_param "-p ${LIVE_PORT}"
+	fi
+
+	local ip
+	for ip in ${LIVE_BIND_IPS}; do
+		add_plugin_param "-i ${ip}"
+	done
+}
+
diff --git a/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff b/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff
new file mode 100644
index 000000000000..1346c9be611d
--- /dev/null
+++ b/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff
@@ -0,0 +1,69 @@
+diff -Naur vdr-live-0.3.0_p20130504.orig/pages/recordings.ecpp vdr-live-0.3.0_p20130504/pages/recordings.ecpp
+--- vdr-live-0.3.0_p20130504.orig/pages/recordings.ecpp	2013-10-23 03:28:13.746493449 +0200
++++ vdr-live-0.3.0_p20130504/pages/recordings.ecpp	2013-10-23 03:29:48.779832793 +0200
+@@ -79,7 +79,11 @@
+ deletions.clear();
+ 
+ int FreeMB, UsedMB;
++#if APIVERSNUM > 20101
++int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB);
++#else
+ int Percent = VideoDiskSpace(&FreeMB, &UsedMB);
++#endif
+ int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
+ int Hours = Minutes / 60;
+ Minutes %= 60;
+diff -Naur vdr-live-0.3.0_p20130504.orig/recman.cpp vdr-live-0.3.0_p20130504/recman.cpp
+--- vdr-live-0.3.0_p20130504.orig/recman.cpp	2013-10-23 03:28:13.756493450 +0200
++++ vdr-live-0.3.0_p20130504/recman.cpp	2013-10-23 03:31:25.813172263 +0200
+@@ -112,7 +112,11 @@
+ 		if (found == string::npos)
+ 			return false;
+ 
++#if APIVERSNUM > 20101
++		string newname = string(cVideoDirectory::Name()) + "/" + name + oldname.substr(found);
++#else
+ 		string newname = string(VideoDirectory) + "/" + name + oldname.substr(found);
++#endif
+ 
+ 		if (!MoveDirectory(oldname.c_str(), newname.c_str(), copy)) {
+ 			esyslog("[LIVE]: renaming failed from '%s' to '%s'", oldname.c_str(), newname.c_str());
+diff -Naur vdr-live-0.3.0_p20130504.orig/tools.cpp vdr-live-0.3.0_p20130504/tools.cpp
+--- vdr-live-0.3.0_p20130504.orig/tools.cpp	2013-10-23 03:28:13.799826786 +0200
++++ vdr-live-0.3.0_p20130504/tools.cpp	2013-10-23 03:34:29.146517191 +0200
+@@ -365,7 +365,11 @@
+ 			stat(source.c_str(), &st1);
+ 			stat(target.c_str(),&st2);
+ 			if (!copy && (st1.st_dev == st2.st_dev)) {
++#if APIVERSNUM > 20101
++				if (!cVideoDirectory::RenameVideoFile(source.c_str(), target.c_str())) {
++#else
+ 				if (!RenameVideoFile(source.c_str(), target.c_str())) {
++#endif
+ 					esyslog("[LIVE]: rename failed from %s to %s", source.c_str(), target.c_str());
+ 					return false;
+ 				}
+@@ -461,7 +465,11 @@
+ 						size_t found = source.find_last_of(delim);
+ 						if (found != std::string::npos) {
+ 							source = source.substr(0, found);
++#if APIVERSNUM > 20101
++							while (source != cVideoDirectory::Name()) {
++#else
+ 							while (source != VideoDirectory) {
++#endif
+ 								found = source.find_last_of(delim);
+ 								if (found == std::string::npos)
+ 									break;
+@@ -478,7 +486,11 @@
+ 					size_t found = target.find_last_of(delim);
+ 					if (found != std::string::npos) {
+ 						target = target.substr(0, found);
++#if APIVERSNUM > 20101
++						while (target != cVideoDirectory::Name()) {
++#else
+ 						while (target != VideoDirectory) {
++#endif
+ 							found = target.find_last_of(delim);
+ 							if (found == std::string::npos)
+ 								break;