Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/78ed855a37cf2db9f3c86acfc999acd7aef04c45)

3 files changed, 14 insertions, 106 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5673d214ffc1..e525b0ff37b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
-# Generated by makepkg 5.0.1
-# Wed Aug 17 16:24:36 UTC 2016
+# Generated by makepkg 5.0.2
+# Thu Sep  7 22:04:50 UTC 2017
 pkgbase = vdr-undelete
 	pkgdesc = allows to undelete accidentally deleted VDR recordings
-	pkgver = 0.0.7
-	pkgrel = 21
-	url = http://projects.vdr-developer.org/projects/plg-undelete
+	pkgver = 2.3.1_pre1
+	pkgrel = 1
+	url = http://phivdr.dyndns.org/vdr/vdr-undelete/
 	arch = x86_64
 	arch = i686
 	arch = arm
@@ -14,13 +14,9 @@ pkgbase = vdr-undelete
 	depends = gcc-libs
 	depends = vdr-api=2.2.0
 	backup = etc/vdr/conf.avail/50-undelete.conf
-	source = http://projects.vdr-developer.org/attachments/download/1060/vdr-undelete-0.0.7.tgz
-	source = undelete-newmakefile-vdr-1.7.36.tgz::http://www.vdr-portal.de/index.php?page=Attachment&attachmentID=32684
-	source = undelete-vdr2.1.2compat.diff
+	source = http://phivdr.dyndns.org/vdr/vdr-undelete/vdr-undelete-2.3.1-pre1.tgz
 	source = 50-undelete.conf
-	md5sums = 667493335e0b1629e72de86a4cc7e558
-	md5sums = e3b79c3d5474e84bc5e7c624553f87a0
-	md5sums = 78999207fa6a1d3714d493d09cc096c2
+	md5sums = c29afb201c0cafe3f2904b5bf9c1d41b
 	md5sums = d37975ef3acb4bcf41c74e56606ad0c1
 
 pkgname = vdr-undelete
diff --git a/PKGBUILD b/PKGBUILD
index f6334866753c..7bff84f24166 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,38 +2,28 @@
 
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=vdr-undelete
-pkgver=0.0.7
+pkgver=2.3.1_pre1
 _vdrapi=2.2.0
-pkgrel=21
+pkgrel=1
 pkgdesc="allows to undelete accidentally deleted VDR recordings"
-url="http://projects.vdr-developer.org/projects/plg-undelete"
+url="http://phivdr.dyndns.org/vdr/vdr-undelete/"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('GPL2')
 depends=('gcc-libs' "vdr-api=${_vdrapi}")
 _plugname=${pkgname//vdr-/}
-source=("http://projects.vdr-developer.org/attachments/download/1060/$pkgname-$pkgver.tgz"
-        "undelete-newmakefile-vdr-1.7.36.tgz::http://www.vdr-portal.de/index.php?page=Attachment&attachmentID=32684"
-        'undelete-vdr2.1.2compat.diff'
+source=("http://phivdr.dyndns.org/vdr/$pkgname/$pkgname-${pkgver/_/-}.tgz"
         "50-$_plugname.conf")
 backup=("etc/vdr/conf.avail/50-$_plugname.conf")
-md5sums=('667493335e0b1629e72de86a4cc7e558'
-         'e3b79c3d5474e84bc5e7c624553f87a0'
-         '78999207fa6a1d3714d493d09cc096c2'
+md5sums=('c29afb201c0cafe3f2904b5bf9c1d41b'
          'd37975ef3acb4bcf41c74e56606ad0c1')
 
-prepare() {
-  cd "${srcdir}/${_plugname}-${pkgver}"
-  patch -p1 -i "$srcdir/undelete-vdr2.1.2compat.diff"
-  cp "$srcdir/undelete/Makefile" .
-}
-
 build() {
-  cd "${srcdir}/${_plugname}-${pkgver}"
+  cd "${srcdir}/${_plugname}-${pkgver/_/-}"
   make
 }
 
 package() {
-  cd "${srcdir}/${_plugname}-${pkgver}"
+  cd "${srcdir}/${_plugname}-${pkgver/_/-}"
   make DESTDIR="$pkgdir" install
 
   install -Dm644 "$srcdir/50-$_plugname.conf" "$pkgdir/etc/vdr/conf.avail/50-$_plugname.conf"
diff --git a/undelete-vdr2.1.2compat.diff b/undelete-vdr2.1.2compat.diff
deleted file mode 100644
index 672ac9ba0fc0..000000000000
--- a/undelete-vdr2.1.2compat.diff
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -ruN undelete-0.0.7/menuundelete.c undelete-0.0.7.edit/menuundelete.c
---- undelete-0.0.7/menuundelete.c	2012-09-29 00:12:22.000000000 +0200
-+++ undelete-0.0.7.edit/menuundelete.c	2013-10-19 14:53:42.319679339 +0200
-@@ -109,7 +109,11 @@
-   if (isdir || Parent)
-   {
-     temp = strdup(filename);
-+#if APIVERSNUM > 20101
-+    char *last = temp + strlen(cVideoDirectory::Name()) + 1;
-+#else
-     char *last = temp + strlen(VideoDirectory) + 1;
-+#endif
-     for (int i = level; *last && i >= Parent ? -1 : 0; i--)
-     {
-       last = strchr(last, '/');
-@@ -635,7 +639,11 @@
-                             {
-                               if (verbose.u)
-                                 isyslog("%s: purge deleted recording (%s)", plugin_name, recording->FileName());
-+#if APIVERSNUM > 20101
-+                              if (!cVideoDirectory::RemoveVideoFile(recording->FileName()))
-+#else
-                               if (!RemoveVideoFile(recording->FileName()))
-+#endif
-                               {
-                                 esyslog("%s: Error while remove deleted recording (%s)", plugin_name, recording->FileName());
-                                 processerror = true;
-@@ -669,7 +677,11 @@
-                                   processerror = true;
-                                 } else
-                                 {
-+#if APIVERSNUM > 20101
-+                                  if (!cVideoDirectory::RenameVideoFile(recording->FileName(), NewName))
-+#else
-                                   if (!RenameVideoFile(recording->FileName(), NewName))
-+#endif
-                                   {
-                                     esyslog("%s: Error while rename deleted recording (%s) to (%s)", plugin_name, recording->FileName(), NewName);
-                                     processerror = true;
-diff -ruN undelete-0.0.7/undelete.c undelete-0.0.7.edit/undelete.c
---- undelete-0.0.7/undelete.c	2012-10-05 00:26:01.000000000 +0200
-+++ undelete-0.0.7.edit/undelete.c	2013-10-19 14:52:08.418606971 +0200
-@@ -840,7 +840,11 @@
-           {
-             if (verbose.u)
-               isyslog("%s: purge deleted recording (%s)", plugin_name, recording->FileName());
-+#if APIVERSNUM > 20101
-+            if (!cVideoDirectory::RemoveVideoFile(recording->FileName()))
-+#else
-             if (!RemoveVideoFile(recording->FileName()))
-+#endif
-             {
-               esyslog("%s: Error while removing deleted recording (%s)", plugin_name, recording->FileName());
-               return cString::sprintf("error while purging the deleted recording \"%s\"  [%s]", Option, recording->Title());
-@@ -952,7 +956,11 @@
-                 return cString::sprintf("recording with the same name exists \"%s\" [%s]", Option, recording->Title());
-               } else
-               {
-+#if APIVERSNUM > 20101
-+                if (!cVideoDirectory::RenameVideoFile(recording->FileName(), (const char *)NewName))
-+#else
-                 if (!RenameVideoFile(recording->FileName(), (const char *)NewName))
-+#endif
-                 {
-                   esyslog("%s: Error while renaming deleted recording (%s) to (%s)", plugin_name, recording->FileName(), (const char *)NewName);
-                   return cString::sprintf("error while renaming deleted recording \"%s\" [%s]", Option, recording->Title());
-@@ -1069,7 +1077,11 @@
- void cRemoveThread::Action(void)
- {
-   d1syslogi("cRemoveThread::Action", "RemoveEmptyVideoDirectories thread started (pid=%d)", getpid());
-+#if APIVERSNUM > 20101
-+  cVideoDirectory::RemoveEmptyVideoDirectories();
-+#else
-   RemoveEmptyVideoDirectories();
-+#endif
-   d1syslogi("cRemoveThread::Action", "RemoveEmptyVideoDirectories thread ended (pid=%d)", getpid());
- }
-