From cf068ec48255c96cc5263c907143c7f6c0fbdcbb Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 24 Mar 2013 22:47:17 +0100
Subject: [PATCH] vdr-vnsiserver3: Change plugin.

---
 config/rootfiles/packages/vdr-vnsiserver3 |  3 ++-
 config/vdr/plugins.d/vnsiserver.conf      |  5 -----
 config/vdr/plugins.d/vnsiserver3.conf     |  5 +++++
 config/vdr/vdr.sysconfig                  |  2 +-
 lfs/vdr-vnsiserver3                       | 17 +++++++++++------
 5 files changed, 19 insertions(+), 13 deletions(-)
 delete mode 100644 config/vdr/plugins.d/vnsiserver.conf
 create mode 100644 config/vdr/plugins.d/vnsiserver3.conf

diff --git a/config/rootfiles/packages/vdr-vnsiserver3 b/config/rootfiles/packages/vdr-vnsiserver3
index 2e78a13e94..79187e0d7e 100644
--- a/config/rootfiles/packages/vdr-vnsiserver3
+++ b/config/rootfiles/packages/vdr-vnsiserver3
@@ -1,3 +1,4 @@
+etc/sysconfig/vdr-plugins.d/vnsiserver3.conf
 etc/vdr/plugins/vnsiserver
 etc/vdr/plugins/vnsiserver/allowed_hosts.conf
-usr/lib/vdr/libvdr-vnsiserver.so.1.7.41
+usr/lib/vdr/libvdr-vnsiserver3.so.1.7.41
diff --git a/config/vdr/plugins.d/vnsiserver.conf b/config/vdr/plugins.d/vnsiserver.conf
deleted file mode 100644
index b69d4ca059..0000000000
--- a/config/vdr/plugins.d/vnsiserver.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Configuration snippet for vdr-vnsiserver                          -*- sh -*-
-#
-# Add command line options to pass to the vnsiserver plugin to PLUGIN_OPTIONS.
-
-PLUGIN_OPTIONS=""
diff --git a/config/vdr/plugins.d/vnsiserver3.conf b/config/vdr/plugins.d/vnsiserver3.conf
new file mode 100644
index 0000000000..7c9706d1cb
--- /dev/null
+++ b/config/vdr/plugins.d/vnsiserver3.conf
@@ -0,0 +1,5 @@
+# Configuration snippet for vdr-vnsiserver3                         -*- sh -*-
+#
+# Add command line options to pass to the vnsiserver3 plugin to PLUGIN_OPTIONS.
+
+PLUGIN_OPTIONS=""
diff --git a/config/vdr/vdr.sysconfig b/config/vdr/vdr.sysconfig
index f4f78bb373..a1cebf10f8 100644
--- a/config/vdr/vdr.sysconfig
+++ b/config/vdr/vdr.sysconfig
@@ -16,7 +16,7 @@ VDR_OPTIONS=(--vfat)
 VDR_PLUGIN_ORDER="
 streamdev-server
 epgsearch
-vnsiserver
+vnsiserver3
 "
 
 # PATH where to find the internally used executables.
diff --git a/lfs/vdr-vnsiserver3 b/lfs/vdr-vnsiserver3
index fd9d6ca1cf..a0e85e1bd4 100644
--- a/lfs/vdr-vnsiserver3
+++ b/lfs/vdr-vnsiserver3
@@ -24,8 +24,8 @@
 
 include Config
 
-VER        = 0.9.0
-THISAPP    = vdr-vnsiserver3
+VER        = cc03615
+THISAPP    = vdr-vnsiserver3-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 
 DL_FROM    = $(URL_IPFIRE)
@@ -38,6 +38,10 @@ DEPS       = "vdr"
 
 VDR_VER    = 1.7.41
 
+EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+CFLAGS    += $(EXTRA_FLAGS)
+CXXFLAGS  += $(EXTRA_FLAGS)
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -46,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5  = 159a36577ea50d9772fcf5a92ffd38b5
+$(DL_FILE)_MD5  = 5100b1cb1ee936f64b99a76c492fbc3f
 
 install : $(TARGET)
 
@@ -81,13 +85,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
 	cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \
+		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 		LOCALEDIR=$$(pwd)/locale all
 
 	-mkdir -pv /etc/vdr/plugins/vnsiserver
-	cd $(DIR_APP) && install -m 755 libvdr-vnsiserver.so \
-		/usr/lib/vdr/libvdr-vnsiserver.so.$(VDR_VER)
+	cd $(DIR_APP) && install -m 755 libvdr-vnsiserver3.so \
+		/usr/lib/vdr/libvdr-vnsiserver3.so.$(VDR_VER)
 	cd $(DIR_APP) && install -m 644 vnsiserver/* /etc/vdr/plugins/vnsiserver
-	install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver.conf \
+	install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver3.conf \
 		/etc/sysconfig/vdr-plugins.d
 
 	@rm -rf $(DIR_APP)
-- 
2.39.5