commit: d91491f93b1342cf7a5f9c4ec92785c7d0d57629 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Jan 15 10:19:24 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Jan 15 10:24:37 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d91491f9
media-plugins/vdr-undelete: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/3338 .../vdr-undelete/files/undelete-0.0.6-info.diff | 25 ------- .../files/undelete-0.0.6-vdr-1.5.7.diff | 14 ---- .../files/vdr-undelete-0.0.6-glibc-2.10.patch | 12 ---- .../files/vdr-undelete-0.0.6_vdr-1.7.3.diff | 76 ---------------------- 4 files changed, 127 deletions(-) diff --git a/media-plugins/vdr-undelete/files/undelete-0.0.6-info.diff b/media-plugins/vdr-undelete/files/undelete-0.0.6-info.diff deleted file mode 100644 index af43147..00000000 --- a/media-plugins/vdr-undelete/files/undelete-0.0.6-info.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- undelete-0.0.6/menuundelete.c.orig 2006-03-22 01:18:57.000000000 -0800 -+++ undelete-0.0.6/menuundelete.c 2006-03-22 01:19:54.000000000 -0800 -@@ -422,7 +422,7 @@ - case 7: recording = GetRecording(item); - #if VDRVERSNUM >= 10325 - if (recording && recording->Info() && recording->Info()->Description() && *recording->Info()->Description()) -- state = AddSubMenu(new cMenuText(tr("Summary"), recording->Info()->Description())); -+ state = AddSubMenu(new cMenuText(tr("Info"), recording->Info()->Description())); - #else - if (recording && recording->Summary() && *recording->Summary()) - state = AddSubMenu(new cMenuText(tr("Summary"), recording->Summary())); ---- undelete-0.0.6/undelete.c.orig 2006-03-22 01:20:06.000000000 -0800 -+++ undelete-0.0.6/undelete.c 2006-03-22 01:23:58.000000000 -0800 -@@ -282,7 +282,11 @@ - FunctionHotKey[4] = tr("Display$purge all"); - FunctionHotKey[5] = tr("Display$salvage all"); - FunctionHotKey[6] = tr("Open"); -+#if VDRVERSNUM >= 10325 -+ FunctionHotKey[7] = tr("Info"); -+#else - FunctionHotKey[7] = tr("Summary"); -+#endif - FunctionHotKey[8] = tr("Display$<--1"); - FunctionHotKey[9] = tr("Display$2-->"); - FunctionHotKey[10] = tr("Display$disp. keys"); diff --git a/media-plugins/vdr-undelete/files/undelete-0.0.6-vdr-1.5.7.diff b/media-plugins/vdr-undelete/files/undelete-0.0.6-vdr-1.5.7.diff deleted file mode 100644 index 91f69f6..00000000 --- a/media-plugins/vdr-undelete/files/undelete-0.0.6-vdr-1.5.7.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- undelete-0.0.6/undelete.c.orig 2007-08-13 06:46:16.000000000 -0700 -+++ undelete-0.0.6/undelete.c 2007-08-13 06:59:10.000000000 -0700 -@@ -198,7 +198,11 @@ - private: - // Add any member variables or functions you may need here. - void FreeKeyNames(void); -+#if VDRVERSNUM >= 10507 -+ char* OSDLanguage; -+#else - int OSDLanguage; -+#endif - void TestAndSetOSDLanguage(void); - bool ProcessArg(int argc, char *argv[]); - #ifdef UND_Debug diff --git a/media-plugins/vdr-undelete/files/vdr-undelete-0.0.6-glibc-2.10.patch b/media-plugins/vdr-undelete/files/vdr-undelete-0.0.6-glibc-2.10.patch deleted file mode 100644 index 5a87bd2..00000000 --- a/media-plugins/vdr-undelete/files/vdr-undelete-0.0.6-glibc-2.10.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur undelete-0.0.6.orig/undelete.c undelete-0.0.6/undelete.c ---- undelete-0.0.6.orig/undelete.c 2006-03-15 23:12:06.000000000 +0200 -+++ undelete-0.0.6/undelete.c 2009-08-09 22:08:26.000000000 +0300 -@@ -934,7 +934,7 @@ - if (verbose.u) - isyslog("%s: undelete recording (%s)", plugin_name, recording->FileName()); - cString NewName = recording->FileName(); -- char *ext = strrchr(NewName, '.'); -+ char *ext = const_cast<char*> (strrchr(NewName, '.')); - if (!strcmp(ext, DELEXT)) - { - strncpy(ext, RECEXT, strlen(ext)); diff --git a/media-plugins/vdr-undelete/files/vdr-undelete-0.0.6_vdr-1.7.3.diff b/media-plugins/vdr-undelete/files/vdr-undelete-0.0.6_vdr-1.7.3.diff deleted file mode 100644 index fc5941d..00000000 --- a/media-plugins/vdr-undelete/files/vdr-undelete-0.0.6_vdr-1.7.3.diff +++ /dev/null @@ -1,76 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 92_undelete-0.0.6-1.7.3.dpatch by Thomas G�nther <t...@toms-cafe.de> -## http://toms-cafe.de/vdr/download/undelete-0.0.6-1.7.3.diff -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Changes for VDR >= 1.7.3. - -@DPATCH@ ---- undelete-0.0.6/menuundelete.c -+++ undelete-0.0.6/menuundelete.c -@@ -672,11 +672,20 @@ eOSState cMenuUndelete::ProcessKey(eKeys - processerror = true; - } - SalvageRecording = true; -+#if VDRVERSNUM >= 10703 -+ cIndexFile *index = new cIndexFile(NewName, false, recording->IsPesRecording()); -+#else - cIndexFile *index = new cIndexFile(NewName, false); -+#endif - int LastFrame = index->Last() - 1; - if (LastFrame > 0) { -+#if VDRVERSNUM >= 10703 -+ uint16_t FileNumber = 0; -+ off_t FileOffset = 0; -+#else - uchar FileNumber = 0; - int FileOffset = 0; -+#endif - index->Get(LastFrame, &FileNumber, &FileOffset); - delete index; - if (FileNumber == 0) { -@@ -686,7 +695,11 @@ eOSState cMenuUndelete::ProcessKey(eKeys - } else { - for (int i = 1; i <= FileNumber; i++) { - char *temp; -+#if VDRVERSNUM >= 10703 -+ asprintf(&temp, recording->IsPesRecording() ? "%s/%03d.vdr" : "%s/%05d.ts", (const char *)NewName, i); -+#else - asprintf(&temp, "%s/%03d.vdr", (const char *)NewName, i); -+#endif - if (access(temp, R_OK) != 0) { - i = FileNumber; - if (verbose.u) ---- undelete-0.0.6/undelete.c -+++ undelete-0.0.6/undelete.c -@@ -956,17 +956,30 @@ cString cPluginUndelete::SVDRPCommand(co - asprintf(&temp, "%sS#%d#", SVDRP_Process ? SVDRP_Process : "", recnumber); - free(SVDRP_Process); - SVDRP_Process = temp; -+#if VDRVERSNUM >= 10703 -+ cIndexFile *index = new cIndexFile(NewName, false, recording->IsPesRecording()); -+#else - cIndexFile *index = new cIndexFile(NewName, false); -+#endif - int LastFrame = index->Last() - 1; - if (LastFrame > 0) { -+#if VDRVERSNUM >= 10703 -+ uint16_t FileNumber = 0; -+ off_t FileOffset = 0; -+#else - uchar FileNumber = 0; - int FileOffset = 0; -+#endif - index->Get(LastFrame, &FileNumber, &FileOffset); - delete index; - if (FileNumber == 0) - return cString::sprintf("error while read last filenumber for \"%s\" [%s]", Option, recording->Title()); - for (int i = 1; i <= FileNumber; i++) { -+#if VDRVERSNUM >= 10703 -+ asprintf(&temp, recording->IsPesRecording() ? "%s/%03d.vdr" : "%s/%05d.ts", (const char *)NewName, i); -+#else - asprintf(&temp, "%s/%03d.vdr", (const char *)NewName, i); -+#endif - if (access(temp, R_OK) != 0) { - free(temp); - return cString::sprintf("error accessing vdrfile %03d for \"%s\" [%s]", i, Option, recording->Title());
