[PATCH] vdr_epgsearch: changed dependency to vdr 2.2.0 and fixed, compatibility with vdr > 2.1.2

[PATCH] vdr_epgsearch: changed dependency to vdr 2.2.0 and fixed, compatibility with vdr > 2.1.2

[Daniel Weismüller]

[-- Attachment #1: Type: text/plain, Size: 3352 bytes --]

 From 6f545bfccf08d53834958a5f61b11cf02ae37bfb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Daniel=20Weism=C3=BCller?= <daniel.weismueller(a)ipfire.org>
Date: Tue, 18 Oct 2016 16:01:57 +0200
Subject: [PATCH] vdr_epgsearch: changed dependency to vdr 2.2.0 and fixed
  compatibility with vdr > 2.1.2
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
---
  config/rootfiles/packages/vdr_epgsearch          |  8 ++++----
  lfs/vdr_epgsearch                                |  5 +++--
  src/patches/vdr-epgsearch-vdr-2.1.2-compat.patch | 15 +++++++++++++++
  3 files changed, 22 insertions(+), 6 deletions(-)
  create mode 100644 src/patches/vdr-epgsearch-vdr-2.1.2-compat.patch

diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch
index 193d79f..7c5b86c 100644
--- a/config/rootfiles/packages/vdr_epgsearch
+++ b/config/rootfiles/packages/vdr_epgsearch
@@ -5,10 +5,10 @@ etc/sysconfig/vdr-plugins.d/quickepgsearch.conf
  etc/vdr/plugins/epgsearch
  etc/vdr/plugins/epgsearch/conf.d
  usr/bin/createcats
-usr/lib/vdr/libvdr-conflictcheckonly.so.2.0.0
-usr/lib/vdr/libvdr-epgsearch.so.2.0.0
-usr/lib/vdr/libvdr-epgsearchonly.so.2.0.0
-usr/lib/vdr/libvdr-quickepgsearch.so.2.0.0
+usr/lib/vdr/libvdr-conflictcheckonly.so.2.2.0
+usr/lib/vdr/libvdr-epgsearch.so.2.2.0
+usr/lib/vdr/libvdr-epgsearchonly.so.2.2.0
+usr/lib/vdr/libvdr-quickepgsearch.so.2.2.0
  #var/lib/vdr
  #var/lib/vdr/data
  var/lib/vdr/data/epgsearch
diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch
index e621670..ba1c751 100644
--- a/lfs/vdr_epgsearch
+++ b/lfs/vdr_epgsearch
@@ -32,11 +32,11 @@ DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/epgsearch-$(VER)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = vdr_epgsearch
-PAK_VER    = 7
+PAK_VER    = 8
  
  DEPS       = ""
  
-VDRPLUGVER = 2.0.0
+VDRPLUGVER = 2.2.0
  
  EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
  CFLAGS    += $(EXTRA_FLAGS)
@@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
  	@$(PREBUILD)
  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
  	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch
+	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/vdr-epgsearch-vdr-2.1.2-compat.patch
  
  	cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \
  		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
diff --git a/src/patches/vdr-epgsearch-vdr-2.1.2-compat.patch b/src/patches/vdr-epgsearch-vdr-2.1.2-compat.patch
new file mode 100644
index 0000000..ac90f4f
--- /dev/null
+++ b/src/patches/vdr-epgsearch-vdr-2.1.2-compat.patch
@@ -0,0 +1,15 @@
+diff -ruN epgsearch-1.0.1.beta5/uservars.h epgsearch-1.0.1.beta5.edit/uservars.h
+--- epgsearch-1.0.1.beta5/uservars.h	2013-03-25 20:30:59.000000000 +0100
++++ epgsearch-1.0.1.beta5.edit/uservars.h	2013-10-19 13:55:15.458605893 +0200
+@@ -538,7 +538,11 @@
+     cVideodirVar() : cInternalVar("videodir") {}
+     string Evaluate(const cEvent*, bool escapeStrings = false)
+ 	{
++#if APIVERSNUM > 20101
++	    return cVideoDirectory::Name();
++#else
+ 	    return VideoDirectory;
++#endif
+ 	}
+ };
+
-- 
2.5.5