diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-plugins/vdr-live/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-plugins/vdr-live/files')
-rw-r--r-- | media-plugins/vdr-live/files/confd | 8 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/confd-0.2 | 23 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/confd-0.3 | 29 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/rc-addon-0.2.sh | 26 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/rc-addon-0.3.sh | 31 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/rc-addon.sh | 11 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch | 44 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff | 69 | ||||
-rw-r--r-- | media-plugins/vdr-live/files/vdr-live_pcre.patch | 26 |
9 files changed, 267 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..790fa962e94a --- /dev/null +++ b/media-plugins/vdr-live/files/rc-addon-0.2.sh @@ -0,0 +1,26 @@ +# $Id$ +# +# 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..74b4738f859d --- /dev/null +++ b/media-plugins/vdr-live/files/rc-addon-0.3.sh @@ -0,0 +1,31 @@ +# $Id$ +# +# 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-1.7.28-compatibility.patch b/media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch new file mode 100644 index 000000000000..d95ebd748c73 --- /dev/null +++ b/media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch @@ -0,0 +1,44 @@ +From e154fec60a27d5a74e6940941f789e17d7169d54 Mon Sep 17 00:00:00 2001 +From: Christian Ruppert <idl0r@gentoo.org> +Date: Mon, 4 Jun 2012 01:42:31 +0200 +Subject: [PATCH] Compile fix for >=vdr-1.7.28 + +--- + tasks.cpp | 10 ++++++++++ + 1 files changed, 10 insertions(+), 0 deletions(-) + +diff --git a/tasks.cpp b/tasks.cpp +index 9f20190..2a2b8d5 100644 +--- a/tasks.cpp ++++ b/tasks.cpp +@@ -60,9 +60,15 @@ void PlayRecordingTask::Action() + + const char *current = NowReplaying(); + if (!current || (0 != strcmp(current, recording->FileName()))) { ++#if VDRVERSNUM >= 10728 ++ cReplayControl::SetRecording( 0 ); ++ cControl::Shutdown(); ++ cReplayControl::SetRecording( recording->FileName() ); ++#else + cReplayControl::SetRecording( 0, 0 ); + cControl::Shutdown(); + cReplayControl::SetRecording( recording->FileName(), recording->Title() ); ++#endif + cControl::Launch( new cReplayControl ); + cControl::Attach(); + } +@@ -122,7 +128,11 @@ void StopRecordingTask::Action() + return; + } + ++#if VDRVERSNUM >= 10728 ++ cReplayControl::SetRecording( 0 ); ++#else + cReplayControl::SetRecording( 0, 0 ); ++#endif + cControl::Shutdown(); + } + +-- +1.7.3.4 + 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; diff --git a/media-plugins/vdr-live/files/vdr-live_pcre.patch b/media-plugins/vdr-live/files/vdr-live_pcre.patch new file mode 100644 index 000000000000..9767cca173a5 --- /dev/null +++ b/media-plugins/vdr-live/files/vdr-live_pcre.patch @@ -0,0 +1,26 @@ +From 6b2965a86a20c885fc1fae8d4dea24b29b38805e Mon Sep 17 00:00:00 2001 +From: Christian Ruppert <idl0r@gentoo.org> +Date: Mon, 4 Jun 2012 02:29:55 +0200 +Subject: [PATCH] Make PCRE optional + +--- + pages/recordings.ecpp | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp +index ebd57e0..8bdad66 100644 +--- a/pages/recordings.ecpp ++++ b/pages/recordings.ecpp +@@ -1,6 +1,9 @@ + <%pre> + #include <string> ++ ++#ifdef HAVE_LIBPCRECPP + #include <pcrecpp.h> ++#endif + + #include <vdr/plugin.h> + #include <vdr/config.h> +-- +1.7.3.4 + |