cleanup old patches; compilefix vdr-2.1.2

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x34C2808A

diff --git a/media-plugins/vdr-remotetimers/ChangeLog b/media-plugins/vdr-remotetimers/ChangeLog
index d9ff08a237c38706bc6e6fd6a26f375136f02c3c..206f943ac0ae3a17ac34cf9c022c3ccca47f9426 100644 (file)
--- a/media-plugins/vdr-remotetimers/ChangeLog
+++ b/media-plugins/vdr-remotetimers/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-remotetimers
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remotetimers/ChangeLog,v 1.16 2014/12/26 13:34:30 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remotetimers/ChangeLog,v 1.17 2014/12/26 18:22:36 hd_brummy Exp $
+
+  26 Dec 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-remotetimers-1.0.1.ebuild,
+  -files/vdr-remotetimers-0.0.1-svdrpservice.diff,
+  -files/vdr-remotetimers-0.0.1-vdr-1.5.3.diff,
+  -files/vdr-remotetimers-0.1.1-Makefile.diff,
+  +files/vdr-remotetimers-1.0.1_vdr-2.1.2.diff:
+  cleanup old patches; compilefix vdr-2.1.2
 
 *vdr-remotetimers-1.0.1 (26 Dec 2014)
 

diff --git a/media-plugins/vdr-remotetimers/Manifest b/media-plugins/vdr-remotetimers/Manifest
index f49c467ea0697df3f2233d8c8b50cdd4eb868cd9..b8f3c5455b7aa840c9b709a942a7e0b79cf3c929 100644 (file)
--- a/media-plugins/vdr-remotetimers/Manifest
+++ b/media-plugins/vdr-remotetimers/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX vdr-remotetimers-0.0.1-svdrpservice.diff 747 SHA256 49d667403817894f386348f06924b5d92c3f08e88761f255c1720ee3c79d4c22 SHA512 70bbec7937fd257abecb93dfffd065866dfb15a4e5db00a666b51b4bbc3852868f1016702ea1605eb4441aa40b2871a76ae37ca9c3957d246ea01748c2f3f249 WHIRLPOOL 274e9356b3ba413e91d43d7a56b8c0831636e03d3bee09037c838033f30f061763fed2ad8bceacf46cbbdd18b40ef76d23b944e3f57f3f9a1ffd50d7a90db480
-AUX vdr-remotetimers-0.0.1-vdr-1.5.3.diff 574 SHA256 bcf203f81658f707023624715bdcdafd47a83726848e27a627579dbbd1c78d79 SHA512 0bf9e50f7d0ba774c13bef54df2484032a8879393cafa102ca96a9bb0aa7bccce66b5f8dd4d28d8d5f89a6913113e434514d2b408850038e844b525bc4f2b109 WHIRLPOOL 885f9a08c511465d3ea6dede0e2841e5223499e4f3c126bf8dc27a93d39087d07e580321e168edeebf7d513b3acbbbbe0e18ef70e8530c1e0aa05dcae6bc5c37
-AUX vdr-remotetimers-0.1.1-Makefile.diff 534 SHA256 e1c81307e03bd354857ddff77131617b8871d4f34a7dd3e7d7de7adc3d2051c5 SHA512 82a9d153d59a8ae667d2da5d622bf75b33bcdb891fb3a3edeba0c792600884e00e8e745d9e3831f5a2330dd2bc1227c30ae7e63bfd1f2072d78184ab82b18002 WHIRLPOOL 7c8f20067893fc79e5cae0d9838cf4361dca3e468aa0eed73a44519f26a820b371cf2cc7d8aeb61c9dff0b21fe9016a4e60e0b7b5aab1a442b4781428bbae8ff
+AUX vdr-remotetimers-1.0.1_vdr-2.1.2.diff 5725 SHA256 8dda2e071468099d1b4d2b4570de6959b1c66a39b9b90061636c977a6d03a2f9 SHA512 cd2f1be6202b531c1d4f5e7b0103b034789b8ffae367b84d9e864fca1e13fbe3867427f08b6170d5c0c58ee98a77ee3641f1d0be0504d38d14a84a3f67d2ab3d WHIRLPOOL 89eb4d28f1caf89a753190878e7be7ea87276d49e62e22a43724559df8a8da4b9a1180b66456aa06670d780c82f0c7b446fdac27fcdd677a21d9d21eac65e217
 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
 EBUILD vdr-remotetimers-1.0.0.ebuild 539 SHA256 bb15fef6ac110b6fef5b2146e0449cb285d7ba42fc6bd7d2eea0f8611c1144c3 SHA512 2d000a69e30430bf37fd60c6613d16fc33246a86e7cce4eecc8380029e74fac0e8b5d5205750640cf2f54deff49b56e0ad73148ef4412dee7b18592f917b1d51 WHIRLPOOL 05e0b5442e9bede1ba8f0eef8300e3c190712afd167a973b18a17a4e54b950ca1f85bc3a24f77f61bdf7f68d8435d31326394abaca0d63e2f540b36a6b25e32f
-EBUILD vdr-remotetimers-1.0.1.ebuild 541 SHA256 c20dc7443e0c9e8ff0522a27d9ad614f03b5c95b151529cdfd97e9b9702d984a SHA512 6de0c33e7da3361919bd71a05ebba9c0ad69a7b208d07db15383af14c77f48e7457bba8e5e2e26577de6193b56460adef4af1a2a6ae963abd8d20f3ecb569209 WHIRLPOOL d1168c4167e54ba63cf854a184e3f1d3f0b70c370736ce7558b7b94c83f6be05e1b40d6ea1f67aa7a735e4631a745e6c6c815c9a7d73ba2e112b429a60379938
-MISC ChangeLog 2832 SHA256 2596ba89d83f457cbb8267dad6e3c21f935edcd0518ced5039437c20494e45ef SHA512 80735d1167e7a9c50e12fd5227e7c6195c1c7ef7db6328bacd3cc6a0e4352115b5be839b5d097af45fd9d421a4f7af32903e303148358a747bed16cd77709e01 WHIRLPOOL f114cd772659c6cc8704d46f1e7d52d5b82547436813552753094ba95e01610388fb621157760dc5eacb7be8b2bab0b899738466f370e1f9db43a004ef9923ee
+EBUILD vdr-remotetimers-1.0.1.ebuild 583 SHA256 658444d6050bb3c647be0fcc6a7510c22570c9078e683f5535d7f56f7c154c15 SHA512 404276b1059f25e301f8a61f6e4377212be672a64c555028e2afe2faa7266b8176eb6f6e8e31bf46619e59019b1e83097c83c4ceab795865e433659e5cd8f909 WHIRLPOOL 604bc3f0bcef9a46d927af0e94750442ffa21bb6d46ae8bf0484508802f2ac6b6fcd942cab94256fc113912d62789068c26a01b7e859dda58fd7faf9e66862fe
+MISC ChangeLog 3159 SHA256 74a2a0febc610f4b2f41bc7f41b7549b851585880398b80e0c271afe056c83f0 SHA512 fe9e9a3f6c6d32b4bd1408411cfb884b47a5eb07a4f93b448820c0be54797d4c16f660f03c5363f880d53b708aecf982e54f00a944944364e2d2c5fa48b15b35 WHIRLPOOL ca1285ab972855de05c3bcf28089399ebc784a5f4ae0dc48b25755d2338045b4109a98feaf0f426f7e03695641a72f68b27652fa746d1747952b1a1cff47e5c4
 MISC metadata.xml 263 SHA256 08d4610093d9d54d33c4f62a4886312290016bd2be38ddbc27391eb4b9c8b2be SHA512 9bd9ba3cd9d88bd9a5b6725414e2975f3c63903105e28146206a1f695ca220f27458d1f0f555940ba36eeca08acb3154688b412f7f42bac6b39257313c5bff09 WHIRLPOOL 6bb513d6040e5a7f01ce6d09aa9ce92c7cb7a3b3839243ca4f9c1e7ac604f3b99162706b201d65223c66b0b11bef0159898daf75a837435b8bb9488400373781
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFUnWPrdn07HTTCgIoRCJV8AKCXbQ4RZOKEZCIazVuqkIE5YoBG6wCcCSmP
-PtxBcQN2U9nsWDXyxnGsI5I=
-=GTV7
+iD8DBQFUnadxdn07HTTCgIoRCORZAKCsqlAYf47UUmNZZrCZIjzSxCPqlACgsp3W
+b87FgVdvR3waAskFc8NrqIs=
+=mvOs
 -----END PGP SIGNATURE-----

diff --git a/media-plugins/vdr-remotetimers/files/vdr-remotetimers-0.0.1-svdrpservice.diff b/media-plugins/vdr-remotetimers/files/vdr-remotetimers-0.0.1-svdrpservice.diff
deleted file mode 100644 (file)
index 07a72b4..0000000
--- a/media-plugins/vdr-remotetimers/files/vdr-remotetimers-0.0.1-svdrpservice.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Bugfix for version 0.0.1 (reported by Maniac@vdrportal):
-Either make sure svdrpservice is loaded before remotetimers or apply
-this patch.
-
---- timers.c.orig      2007-03-16 07:39:06.000000000 +0100
-+++ timers.c   2007-03-16 07:41:27.000000000 +0100
-@@ -48,7 +48,7 @@
- // cRemoteTimers -------------------------------------------------
- 
- cRemoteTimers::cRemoteTimers(): refcount(0) {
--      plugin = cPluginManager::GetPlugin("svdrpservice");
-+      plugin = NULL;
-       svdrp.handle = -1;
- }
- 
-@@ -59,6 +59,8 @@
- 
- bool cRemoteTimers::Connect() {
-       refcount++;
-+      if (!plugin)
-+              plugin = cPluginManager::GetPlugin("svdrpservice");
-       if (plugin && svdrp.handle < 0) {
-               svdrp.serverIp = RemoteTimersSetup.serverIp;
-               svdrp.serverPort = RemoteTimersSetup.serverPort;

diff --git a/media-plugins/vdr-remotetimers/files/vdr-remotetimers-0.0.1-vdr-1.5.3.diff b/media-plugins/vdr-remotetimers/files/vdr-remotetimers-0.0.1-vdr-1.5.3.diff
deleted file mode 100644 (file)
index b3f5057..0000000
--- a/media-plugins/vdr-remotetimers/files/vdr-remotetimers-0.0.1-vdr-1.5.3.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru remotetimers-0.0.1-orig/menu.c remotetimers-0.0.1/menu.c
---- remotetimers-0.0.1-orig/menu.c     2007-10-07 14:07:19.565912321 +0200
-+++ remotetimers-0.0.1/menu.c  2007-10-07 14:08:13.062429433 +0200
-@@ -206,7 +206,11 @@
- {
-   cString day, name("");
-   if (timer->WeekDays())
-+#if APIVERSNUM >= 10503
-+     day = timer->PrintDay(0, timer->WeekDays(), false);
-+#else
-      day = timer->PrintDay(0, timer->WeekDays());
-+#endif
-   else if (timer->Day() - time(NULL) < 28 * SECSINDAY) {
-      day = itoa(timer->GetMDay(timer->Day()));
-      name = WeekDayName(timer->Day());

diff --git a/media-plugins/vdr-remotetimers/files/vdr-remotetimers-0.1.1-Makefile.diff b/media-plugins/vdr-remotetimers/files/vdr-remotetimers-0.1.1-Makefile.diff
deleted file mode 100644 (file)
index 0b7b0f4..0000000
--- a/media-plugins/vdr-remotetimers/files/vdr-remotetimers-0.1.1-Makefile.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur remotetimers-0.1.1.orig/Makefile remotetimers-0.1.1/Makefile
---- remotetimers-0.1.1.orig/Makefile    2009-02-23 21:43:12.000000000 +0100
-+++ remotetimers-0.1.1/Makefile 2009-02-23 21:44:08.000000000 +0100
-@@ -34,7 +34,7 @@
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
-
- ### Test whether VDR has locale support
--VDRLOCALE = $(shell grep '^LOCALEDIR' $(VDRDIR)/Makefile)
-+VDRLOCALE = $(shell grep '^LOCDIR' $(VDRDIR)/Make.config)
-
- ### The name of the distribution archive:
-
-

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 (file)
index 0000000..287c8c2
--- /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/vdr-remotetimers-1.0.1.ebuild b/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.1.ebuild
index ce8dd36c2da399a891365696915f32a6880d3efa..c08019343d43b86fce3479003f724ea973b15899 100644 (file)
--- a/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.1.ebuild
+++ b/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.1.ebuild,v 1.1 2014/12/26 13:34:30 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remotetimers/vdr-remotetimers-1.0.1.ebuild,v 1.2 2014/12/26 18:22:36 hd_brummy Exp $
 
 EAPI="5"
 
@@ -17,3 +17,5 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-2.0.0"
 RDEPEND="${DEPEND}"
+
+PATCHES="${FILESDIR}/${P}_vdr-2.1.2.diff"
\ No newline at end of file