From c1cfda672e9436718af8cc59f794fa71340d10a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Weism=C3=BCller?= daniel.weismueller@ipfire.org Date: Tue, 18 Oct 2016 16:14:20 +0200 Subject: [PATCH] vdr_vnsi: updated to version 1.5.1, changed dependency to vdr 2.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit
Signed-off-by: Daniel Weismüller daniel.weismueller@ipfire.org --- config/rootfiles/packages/vdr_vnsiserver | 4 ++++ config/rootfiles/packages/vdr_vnsiserver5 | 4 ---- config/vdr/plugins.d/vnsiserver.conf | 5 +++++ config/vdr/plugins.d/vnsiserver5.conf | 5 ----- lfs/{vdr_vnsiserver5 => vdr_vnsiserver} | 22 +++++++++++----------- make.sh | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 config/rootfiles/packages/vdr_vnsiserver delete mode 100644 config/rootfiles/packages/vdr_vnsiserver5 create mode 100644 config/vdr/plugins.d/vnsiserver.conf delete mode 100644 config/vdr/plugins.d/vnsiserver5.conf rename lfs/{vdr_vnsiserver5 => vdr_vnsiserver} (86%)
diff --git a/config/rootfiles/packages/vdr_vnsiserver b/config/rootfiles/packages/vdr_vnsiserver new file mode 100644 index 0000000..26eef96 --- /dev/null +++ b/config/rootfiles/packages/vdr_vnsiserver @@ -0,0 +1,4 @@ +etc/sysconfig/vdr-plugins.d/vnsiserver.conf +etc/vdr/plugins/vnsiserver +etc/vdr/plugins/vnsiserver/allowed_hosts.conf +usr/lib/vdr/libvdr-vnsiserver.so.2.2.0 diff --git a/config/rootfiles/packages/vdr_vnsiserver5 b/config/rootfiles/packages/vdr_vnsiserver5 deleted file mode 100644 index 9b27e97..0000000 --- a/config/rootfiles/packages/vdr_vnsiserver5 +++ /dev/null @@ -1,4 +0,0 @@ -etc/sysconfig/vdr-plugins.d/vnsiserver5.conf -etc/vdr/plugins/vnsiserver5 -etc/vdr/plugins/vnsiserver5/allowed_hosts.conf -usr/lib/vdr/libvdr-vnsiserver5.so.2.0.0 diff --git a/config/vdr/plugins.d/vnsiserver.conf b/config/vdr/plugins.d/vnsiserver.conf new file mode 100644 index 0000000..b69d4ca --- /dev/null +++ b/config/vdr/plugins.d/vnsiserver.conf @@ -0,0 +1,5 @@ +# 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/vnsiserver5.conf b/config/vdr/plugins.d/vnsiserver5.conf deleted file mode 100644 index 561552d..0000000 --- a/config/vdr/plugins.d/vnsiserver5.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Configuration snippet for vdr-vnsiserver5 -*- sh -*- -# -# Add command line options to pass to the vnsiserver5 plugin to PLUGIN_OPTIONS. - -PLUGIN_OPTIONS="" diff --git a/lfs/vdr_vnsiserver5 b/lfs/vdr_vnsiserver similarity index 86% rename from lfs/vdr_vnsiserver5 rename to lfs/vdr_vnsiserver index 0416416..1bbd3fe 100644 --- a/lfs/vdr_vnsiserver5 +++ b/lfs/vdr_vnsiserver @@ -24,23 +24,23 @@
include Config
-VER = 1.0.0 -THISAPP = vdr-vnsiserver5-$(VER) +VER = 1.5.1 +THISAPP = vdr-plugin-vnsiserver-$(VER) DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = vdr_vnsiserver5 +PROG = vdr_vnsiserver PAK_VER = 1
DEPS = "vdr"
-VDRPLUGVER = 2.0.0 +VDRPLUGVER = 2.2.0
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) -CXXFLAGS += $(EXTRA_FLAGS) +CXXFLAGS += $(EXTRA_FLAGS) -std=gnu++11
############################################################################### # Top-level Rules @@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3d1a0b21d11187e43a56f9e4cf7cb1c9 +$(DL_FILE)_MD5 = 90f53f361e6928915ba3c78e6b5db05a
install : $(TARGET)
@@ -88,11 +88,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ LOCALEDIR=$$(pwd)/locale all
- -mkdir -pv /etc/vdr/plugins/vnsiserver5 - cd $(DIR_APP) && install -m 755 libvdr-vnsiserver5.so \ - /usr/lib/vdr/libvdr-vnsiserver5.so.$(VDRPLUGVER) - ln -svf ../../svdrphosts.conf /etc/vdr/plugins/vnsiserver5/allowed_hosts.conf - install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver5.conf \ + -mkdir -pv /etc/vdr/plugins/vnsiserver + cd $(DIR_APP) && install -m 755 libvdr-vnsiserver.so \ + /usr/lib/vdr/libvdr-vnsiserver.so.$(VDRPLUGVER) + ln -svf ../../svdrphosts.conf /etc/vdr/plugins/vnsiserver/allowed_hosts.conf + install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver.conf \ /etc/sysconfig/vdr-plugins.d
@rm -rf $(DIR_APP) diff --git a/make.sh b/make.sh index 9289d81..d1951d3 100755 --- a/make.sh +++ b/make.sh @@ -730,7 +730,7 @@ buildipfire() { ipfiremake ffmpeg ipfiremake vdr ipfiremake vdr_streamdev - ipfiremake vdr_vnsiserver5 + ipfiremake vdr_vnsiserver ipfiremake vdr_epgsearch ipfiremake vdr_dvbapi ipfiremake vdr_eepg