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-remotetimers | |
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-remotetimers')
6 files changed, 208 insertions, 0 deletions
diff --git a/media-plugins/vdr-remotetimers/Manifest b/media-plugins/vdr-remotetimers/Manifest new file mode 100644 index 000000000000..e932e3b3216d --- /dev/null +++ b/media-plugins/vdr-remotetimers/Manifest @@ -0,0 +1,3 @@ +DIST vdr-remotetimers-1.0.0.tgz 56861 SHA256 41757ced5cece7650596808778b83d06264bc9ee2156691c522dae7c259649ae SHA512 7b1bd1f57f7f150b92fa026d7120ecf6018e0a4f084980474fe3d1e439cd88779460deeb55393f2f986753c93ac1914db93d4104767103a616b16589a7417733 WHIRLPOOL 2ead7bbac480706cd214bae7485d979643d880efc70523e50ff07ae44114caf78554b62be597f37d911a2aefab62e490cc00ee9030a2b395a7f276d882d277ce +DIST vdr-remotetimers-1.0.1.tgz 62505 SHA256 c87fc8eabd70f42de57d6b0eb813487496f7ff809aedbcc492766fa6f1d06c17 SHA512 8eb404d7125b387bf33283f9dff2100f9bfbaa7c7a5b2dba649be20712ed468f4dcb7b3c2a2514046b3dd31fdc49fde493da53e97086f761a7b4784f50aab015 WHIRLPOOL 107a41ecb96d8785a8737053ce435cc40539f813fc0ce27d3ca32251f96e1b0b77b10c4da48195706cd4b606822727007a7b9bdb54ec548b3b212d79d0de4964 +DIST vdr-remotetimers-1.0.2.tgz 62750 SHA256 cc8916695819f4bb9c02417a31f726e61f2e27da284a70ccefb50ee1e10242f1 SHA512 37a93600e11c21b0ab5d18b0e0631b527db96b4a19967b34fb7f912607f803ca8872efdbd642dfcde0953129b7a1a8fe971459deab6d8c78449f94505d8674de WHIRLPOOL e141f59b4cc5ffd5b439db9551ec8288633ed290314d5abc3663bb1b128a643547da1fe55fe0748ff8a678f65a6e82351fa06b432ce9fc50461662a2e0d70d8f diff --git a/media-plugins/vdr-remotetimers/files/vdr-remotetimers-1.0.1_vdr-2.1.2.diff b/media-plugins/vdr-remotetimers/files/vdr-remotetimers-1.0.1_vdr-2.1.2.diff new file mode 100644 index 000000000000..287c8c2e6ec4 --- /dev/null +++ b/media-plugins/vdr-remotetimers/files/vdr-remotetimers-1.0.1_vdr-2.1.2.diff @@ -0,0 +1,137 @@ +diff -Naur remotetimers-1.0.1.orig/menu.c remotetimers-1.0.1/menu.c +--- remotetimers-1.0.1.orig/menu.c 2014-12-26 18:41:16.359719486 +0100 ++++ remotetimers-1.0.1/menu.c 2014-12-26 18:42:58.843051214 +0100 +@@ -189,14 +189,23 @@ + bool cFreeDiskSpace::HasChanged(const char *SubDir, bool ForceCheck) + { + cString path(ExchangeChars(strdup(SubDir ? SubDir : ""), true), true); ++#if APIVERSNUM > 20101 ++ path = cString::sprintf("%s/%s", cVideoDirectory::Name(), *path); ++#else + path = cString::sprintf("%s/%s", VideoDirectory, *path); ++#endif + if (ForceCheck || time(NULL) - lastDiskSpaceCheck > DISKSPACECHEK || !EntriesOnSameFileSystem(path, lastPath)) { + int FreeMB; + int Percent; + int MBperMinute = -1; + lastPath = path; ++#if APIVERSNUM > 20101 ++ if (cVideoDirectory::IsOnVideoDirectoryFileSystem(path)) { ++ Percent = cVideoDirectory::VideoDiskSpace(&FreeMB); ++#else + if (IsOnVideoDirectoryFileSystem(path)) { + Percent = ::VideoDiskSpace(&FreeMB); ++#endif + MBperMinute = Recordings.MBperMinute(); + } + else { +@@ -1758,8 +1767,13 @@ + int len = strlen(RemoteTimersSetup.serverDir); + bool remote = len == 0 || (strstr(name, RemoteTimersSetup.serverDir) == name && name[len] == FOLDERDELIMCHAR); + if (!remote) { ++#if APIVERSNUM > 20101 ++ if (RecordingsHandler.GetUsage(*fileName) == ruNone) { ++ if (RecordingsHandler.Add(ruCut, *fileName)) ++#else + if (!cCutter::Active()) { + if (cCutter::Start(*fileName)) ++#endif + Skins.Message(mtInfo, tr("Editing process started")); + else + Skins.Message(mtError, tr("Can't start editing process!")); +@@ -1898,7 +1912,11 @@ + name[len] = '\0'; + } + cString newName(ExchangeChars(strdup(name), true), true); ++#if APIVERSNUM > 20101 ++ newName = cString::sprintf("%s/%s%s", cVideoDirectory::Name(), *newName, p); ++#else + newName = cString::sprintf("%s/%s%s", VideoDirectory, *newName, p); ++#endif + bool wasMoving = cMoveRec::IsMoving(); + if (Rename(Recording, newName)) { + // keep old name when moving recording in background +@@ -2215,7 +2233,11 @@ + + cString cMenuRecordings::DirectoryName(void) + { ++#if APIVERSNUM > 20101 ++ cString d(cVideoDirectory::Name()); ++#else + cString d(VideoDirectory); ++#endif + if (base) { + char *s = ExchangeChars(strdup(base), true); + d = AddDirectory(d, s); +@@ -2312,9 +2334,17 @@ + } + cRecording *recording = ri->Recording(); + cString FileName = recording->FileName(); ++#if APIVERSNUM > 20101 ++ if (RecordingsHandler.GetUsage(*FileName) != ruNone) { ++#else + if (cCutter::Active(ri->Recording()->FileName())) { ++#endif + if (Interface->Confirm(tr("Recording is being edited - really delete?"))) { ++#if APIVERSNUM > 20101 ++ RecordingsHandler.Del(*FileName); ++#else + cCutter::Stop(); ++#endif + recording = Recordings.GetByName(FileName); // cCutter::Stop() might have deleted it if it was the edited version + // we continue with the code below even if recording is NULL, + // in order to have the menu updated etc. +diff -Naur remotetimers-1.0.1.orig/remotetimers.c remotetimers-1.0.1/remotetimers.c +--- remotetimers-1.0.1.orig/remotetimers.c 2014-12-26 18:41:16.363052819 +0100 ++++ remotetimers-1.0.1/remotetimers.c 2014-12-26 18:42:58.846384548 +0100 +@@ -172,11 +172,23 @@ + if (*RemoteTimersSetup.serverDir) { + ir->name = cString::sprintf("%s~%s", RemoteTimersSetup.serverDir, recording.Name()); + ++#if APIVERSNUM > 20101 ++ int len = strlen(cVideoDirectory::Name()); ++#else + int len = strlen(VideoDirectory); ++#endif + ir->fileName = recording.FileName(); ++#if APIVERSNUM > 20101 ++ if (strncmp(ir->fileName, cVideoDirectory::Name(), strlen(cVideoDirectory::Name())) == 0 && ir->fileName[len] == '/') { ++#else + if (strncmp(ir->fileName, VideoDirectory, strlen(VideoDirectory)) == 0 && ir->fileName[len] == '/') { ++#endif + char *serverDir = ExchangeChars(strdup(RemoteTimersSetup.serverDir), true); ++#if APIVERSNUM > 20101 ++ ir->fileName = cString::sprintf("%s/%s%s", cVideoDirectory::Name(), serverDir, ir->fileName + len); ++#else + ir->fileName = cString::sprintf("%s/%s%s", VideoDirectory, serverDir, ir->fileName + len); ++#endif + free(serverDir); + } + else { +diff -Naur remotetimers-1.0.1.orig/watcher.c remotetimers-1.0.1/watcher.c +--- remotetimers-1.0.1.orig/watcher.c 2014-12-26 18:41:16.363052819 +0100 ++++ remotetimers-1.0.1/watcher.c 2014-12-26 18:42:58.846384548 +0100 +@@ -44,7 +44,11 @@ + cUpdateWatcher::cUpdateWatcher(): cThread("remotetimers update file watcher") + { + serverLastModifiedTime = 0; ++#if APIVERSNUM > 20101 ++ clientUpdateFile = AddDirectory(cVideoDirectory::Name(), ".update"); ++#else + clientUpdateFile = AddDirectory(VideoDirectory, ".update"); ++#endif + clientLastDev = 0; + inSubDir = false; + } +@@ -63,7 +67,11 @@ + // server recordings in subdir: check mtime of subdir/.update + char *tmpDir = strdup(RemoteTimersSetup.serverDir); + tmpDir = ExchangeChars(tmpDir, true); ++#if APIVERSNUM > 20101 ++ serverUpdateFile = AddDirectory(cVideoDirectory::Name(), AddDirectory(tmpDir, ".update")); ++#else + serverUpdateFile = AddDirectory(VideoDirectory, AddDirectory(tmpDir, ".update")); ++#endif + serverLastModifiedTime = LastModifiedTime(serverUpdateFile); + free(tmpDir); + } diff --git a/media-plugins/vdr-remotetimers/metadata.xml b/media-plugins/vdr-remotetimers/metadata.xml new file mode 100644 index 000000000000..57cbe8aa99b6 --- /dev/null +++ b/media-plugins/vdr-remotetimers/metadata.xml @@ -0,0 +1,9 @@ +<?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> +</pkgmetadata> diff --git a/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.0.ebuild b/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.0.ebuild new file mode 100644 index 000000000000..aa11243c1a6a --- /dev/null +++ b/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit vdr-plugin-2 + +DESCRIPTION="VDR plugin: edit timers on remote vdr instances" +HOMEPAGE="http://vdr.schmirler.de/" +SRC_URI="http://vdr.schmirler.de/${PN#vdr-}/${P}.tgz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND=">=media-video/vdr-2.0.0" +RDEPEND="${DEPEND}" diff --git a/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.1.ebuild b/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.1.ebuild new file mode 100644 index 000000000000..205f5bc07c0e --- /dev/null +++ b/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit vdr-plugin-2 + +DESCRIPTION="VDR plugin: edit timers on remote vdr instances" +HOMEPAGE="http://vdr.schmirler.de/" +SRC_URI="http://vdr.schmirler.de/${PN#vdr-}/${P}.tgz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">=media-video/vdr-2.0.0" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}_vdr-2.1.2.diff" ) diff --git a/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.2.ebuild b/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.2.ebuild new file mode 100644 index 000000000000..91062b475826 --- /dev/null +++ b/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.2.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit vdr-plugin-2 + +DESCRIPTION="VDR plugin: edit timers on remote vdr instances" +HOMEPAGE="http://vdr.schmirler.de/" +SRC_URI="http://vdr.schmirler.de/${PN#vdr-}/${P}.tgz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">=media-video/vdr-2.0.0" +RDEPEND="${DEPEND}" |