From c435d7dc16c0e5c83842be62e6a8681db6abe253 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 20 Mar 2013 17:30:09 +0100 Subject: [PATCH] vdr: Add plugins: -streamdev, -epgsearch, -vnsiserver3. --- config/rootfiles/packages/vdr-epgsearch | 14 +++ config/rootfiles/packages/vdr-streamdev | 8 ++ config/rootfiles/packages/vdr-vnsiserver3 | 3 + config/rootfiles/packages/vdr_epgsearch | 25 ---- config/rootfiles/packages/vdr_softdevice | 26 ----- config/vdr/plugins.d/conflictcheckonly.conf | 7 ++ config/vdr/plugins.d/epgsearch.conf | 6 + config/vdr/plugins.d/epgsearchonly.conf | 7 ++ config/vdr/plugins.d/quickepgsearch.conf | 7 ++ config/vdr/plugins.d/streamdev-server.conf | 5 + lfs/vdr | 4 +- lfs/vdr-epgsearch | 109 ++++++++++++++++++ lfs/{vdr_softdevice => vdr-streamdev} | 69 +++++++++-- lfs/{vdr_epgsearch => vdr-vnsiserver3} | 60 ++++++++-- make.sh | 3 + .../vdr-epgsearch-1.0.1.beta3-paths.patch | 82 +++++++++++++ 16 files changed, 361 insertions(+), 74 deletions(-) create mode 100644 config/rootfiles/packages/vdr-epgsearch create mode 100644 config/rootfiles/packages/vdr-streamdev create mode 100644 config/rootfiles/packages/vdr-vnsiserver3 delete mode 100644 config/rootfiles/packages/vdr_epgsearch delete mode 100644 config/rootfiles/packages/vdr_softdevice create mode 100644 config/vdr/plugins.d/conflictcheckonly.conf create mode 100644 config/vdr/plugins.d/epgsearch.conf create mode 100644 config/vdr/plugins.d/epgsearchonly.conf create mode 100644 config/vdr/plugins.d/quickepgsearch.conf create mode 100644 config/vdr/plugins.d/streamdev-server.conf create mode 100644 lfs/vdr-epgsearch rename lfs/{vdr_softdevice => vdr-streamdev} (51%) rename lfs/{vdr_epgsearch => vdr-vnsiserver3} (57%) create mode 100644 src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch diff --git a/config/rootfiles/packages/vdr-epgsearch b/config/rootfiles/packages/vdr-epgsearch new file mode 100644 index 000000000..d09bf4b97 --- /dev/null +++ b/config/rootfiles/packages/vdr-epgsearch @@ -0,0 +1,14 @@ +etc/sysconfig/vdr-plugins.d/conflictcheckonly.conf +etc/sysconfig/vdr-plugins.d/epgsearch.conf +etc/sysconfig/vdr-plugins.d/epgsearchonly.conf +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.1.7.41 +usr/lib/vdr/libvdr-epgsearch.so.1.7.41 +usr/lib/vdr/libvdr-epgsearchonly.so.1.7.41 +usr/lib/vdr/libvdr-quickepgsearch.so.1.7.41 +#var/lib/vdr +#var/lib/vdr/data +var/lib/vdr/data/epgsearch diff --git a/config/rootfiles/packages/vdr-streamdev b/config/rootfiles/packages/vdr-streamdev new file mode 100644 index 000000000..3b05d026d --- /dev/null +++ b/config/rootfiles/packages/vdr-streamdev @@ -0,0 +1,8 @@ +etc/sysconfig/vdr-plugins.d/streamdev-server.conf +#etc/vdr/plugins +etc/vdr/plugins/streamdev-server +etc/vdr/plugins/streamdev-server/streamdevhosts.conf +#usr/lib/vdr +#usr/lib/vdr/bin +usr/lib/vdr/bin/externremux.sh +usr/lib/vdr/libvdr-streamdev-server.so.1.7.41 diff --git a/config/rootfiles/packages/vdr-vnsiserver3 b/config/rootfiles/packages/vdr-vnsiserver3 new file mode 100644 index 000000000..2e78a13e9 --- /dev/null +++ b/config/rootfiles/packages/vdr-vnsiserver3 @@ -0,0 +1,3 @@ +etc/vdr/plugins/vnsiserver +etc/vdr/plugins/vnsiserver/allowed_hosts.conf +usr/lib/vdr/libvdr-vnsiserver.so.1.7.41 diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch deleted file mode 100644 index 1485d7523..000000000 --- a/config/rootfiles/packages/vdr_epgsearch +++ /dev/null @@ -1,25 +0,0 @@ -opt/vdr/PLUGINS/lib/libvdr-conflictcheckonly.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-epgsearch.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-epgsearchonly.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-quickepgsearch.so.1.6.0 -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-epgsearch.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-epgsearch.mo diff --git a/config/rootfiles/packages/vdr_softdevice b/config/rootfiles/packages/vdr_softdevice deleted file mode 100644 index de66a778d..000000000 --- a/config/rootfiles/packages/vdr_softdevice +++ /dev/null @@ -1,26 +0,0 @@ -opt/vdr/bin/runvdr-soft -opt/vdr/PLUGINS/lib/libsoftdevice-dfb.so.1.6.0 -opt/vdr/PLUGINS/lib/libsoftdevice-fb.so.1.6.0 -opt/vdr/PLUGINS/lib/libsoftdevice-shm.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-softdevice.so.1.6.0 -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-softdevice.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-softdevice.mo diff --git a/config/vdr/plugins.d/conflictcheckonly.conf b/config/vdr/plugins.d/conflictcheckonly.conf new file mode 100644 index 000000000..d5146946d --- /dev/null +++ b/config/vdr/plugins.d/conflictcheckonly.conf @@ -0,0 +1,7 @@ +# Configuration snippet for vdr-conflictcheckonly -*- sh -*- +# +# Add command line options to pass to the conflictcheckonly plugin to +# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED. + +PLUGIN_ENABLED=false +PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/epgsearch.conf b/config/vdr/plugins.d/epgsearch.conf new file mode 100644 index 000000000..3c731190f --- /dev/null +++ b/config/vdr/plugins.d/epgsearch.conf @@ -0,0 +1,6 @@ +# Configuration snippet for vdr-epgsearch -*- sh -*- +# +# Add command line options to pass to the epgsearch plugin to PLUGIN_OPTIONS, +# see the epgsearch(1) man page for information about available options. + +PLUGIN_OPTIONS="-l /var/log/vdr/epgsearch.log" diff --git a/config/vdr/plugins.d/epgsearchonly.conf b/config/vdr/plugins.d/epgsearchonly.conf new file mode 100644 index 000000000..9208556fb --- /dev/null +++ b/config/vdr/plugins.d/epgsearchonly.conf @@ -0,0 +1,7 @@ +# Configuration snippet for vdr-epgsearchonly -*- sh -*- +# +# Add command line options to pass to the epgsearchonly plugin to +# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED. + +PLUGIN_ENABLED=false +PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/quickepgsearch.conf b/config/vdr/plugins.d/quickepgsearch.conf new file mode 100644 index 000000000..e30285061 --- /dev/null +++ b/config/vdr/plugins.d/quickepgsearch.conf @@ -0,0 +1,7 @@ +# Configuration snippet for vdr-quickepgsearch -*- sh -*- +# +# Add command line options to pass to the quickepgsearch plugin to +# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED. + +PLUGIN_ENABLED=false +PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/streamdev-server.conf b/config/vdr/plugins.d/streamdev-server.conf new file mode 100644 index 000000000..52c11cfc3 --- /dev/null +++ b/config/vdr/plugins.d/streamdev-server.conf @@ -0,0 +1,5 @@ +# Configuration snippet for vdr-streamdev-server -*- sh -*- +# +# Add command line options to pass to the streamdev-server plugin to PLUGIN_OPTIONS. + +PLUGIN_OPTIONS="" diff --git a/lfs/vdr b/lfs/vdr index f881134dc..069b90ea8 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -34,14 +34,14 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr PAK_VER = 6 -DEPS = "freefont" +DEPS = "freefont vdr-streamdev" MAKE_OPTIONS = \ PREFIX=/usr \ BINDIR=/usr/bin \ CACHEDIR=/var/cache/vdr \ CONFDIR=/etc/vdr \ - INCDIR=/usr/include/vdr \ + INCDIR=/usr/include \ LIBDIR=/usr/lib/vdr \ LOCDIR=/usr/share/locale \ MANDIR=/usr/share/man \ diff --git a/lfs/vdr-epgsearch b/lfs/vdr-epgsearch new file mode 100644 index 000000000..b8543b3dd --- /dev/null +++ b/lfs/vdr-epgsearch @@ -0,0 +1,109 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2012 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.1.beta3 +THISAPP = vdr-epgsearch-$(VER) +DL_FILE = $(THISAPP).tgz + +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/epgsearch-$(VER) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = vdr-epgsearch +PAK_VER = 1 + +DEPS = "vdr" + +VDR_VER = 1.7.41 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = f39e5ace38ea99f114425687057e4dbe + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download : $(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(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) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ + LOCALEDIR=$$(pwd)/locale all + + cd $(DIR_APP) && install -m 755 libvdr-conflictcheckonly.so \ + /usr/lib/vdr/libvdr-conflictcheckonly.so.$(VDR_VER) + cd $(DIR_APP) && install -m 755 libvdr-epgsearchonly.so \ + /usr/lib/vdr/libvdr-epgsearchonly.so.$(VDR_VER) + cd $(DIR_APP) && install -m 755 libvdr-epgsearch.so \ + /usr/lib/vdr/libvdr-epgsearch.so.$(VDR_VER) + cd $(DIR_APP) && install -m 755 libvdr-quickepgsearch.so \ + /usr/lib/vdr/libvdr-quickepgsearch.so.$(VDR_VER) + + install -m 644 \ + $(DIR_SRC)/config/vdr/plugins.d/epgsearch.conf \ + $(DIR_SRC)/config/vdr/plugins.d/epgsearchonly.conf \ + $(DIR_SRC)/config/vdr/plugins.d/conflictcheckonly.conf \ + $(DIR_SRC)/config/vdr/plugins.d/quickepgsearch.conf \ + /etc/sysconfig/vdr-plugins.d + + -mkdir -pv /etc/vdr/plugins/epgsearch/conf.d + -mkdir -pv /var/lib/vdr/data/epgsearch + + cd $(DIR_APP) && install -m 755 createcats /usr/bin/createcats + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/vdr_softdevice b/lfs/vdr-streamdev similarity index 51% rename from lfs/vdr_softdevice rename to lfs/vdr-streamdev index c836e2e6d..6b0e52028 100644 --- a/lfs/vdr_softdevice +++ b/lfs/vdr-streamdev @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,29 +24,76 @@ include Config -VER = plugin +VER = 0.6.1 +GIT_VER = 10db11ac +THISAPP = vdr-streamdev-$(GIT_VER) +DL_FILE = $(THISAPP).tar.xz -THISAPP = vdr_softdevice-$(VER) +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -PROG = vdr_softdevice -PAK_VER = 5 +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = vdr-streamdev +PAK_VER = 1 -DEPS = "vdr ffmpeg sdl alsa dfb++" +DEPS = "vdr" + +VDR_VER = 1.7.41 ############################################################################### # Top-level Rules ############################################################################### +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -install : +$(DL_FILE)_MD5 = e5011fd1a4b0624b192911f37c6040e3 -check : +install : $(TARGET) -download : +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) -md5 : +download : $(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) dist: - $(PAK) + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) ############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && sed -i 's@$(VDRDIR)/device.h@/usr/include/vdr/device.h@' Makefile + cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ + LOCALEDIR=$$(pwd)/locale all + + -mkdir -pv /etc/vdr/plugins/streamdev-server /usr/lib/vdr/bin + cd $(DIR_APP) && install -m 755 server/libvdr-streamdev-server.so \ + /usr/lib/vdr/libvdr-streamdev-server.so.$(VDR_VER) + cd $(DIR_APP) && install -m 644 streamdev-server/streamdevhosts.conf \ + /etc/vdr/plugins/streamdev-server + cd $(DIR_APP) && install -m 755 streamdev-server/externremux.sh \ + /usr/lib/vdr/bin/externremux.sh + install -m 644 $(DIR_SRC)/config/vdr/plugins.d/streamdev-server.conf \ + /etc/sysconfig/vdr-plugins.d + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/vdr_epgsearch b/lfs/vdr-vnsiserver3 similarity index 57% rename from lfs/vdr_epgsearch rename to lfs/vdr-vnsiserver3 index ead59a152..da0e4a756 100644 --- a/lfs/vdr_epgsearch +++ b/lfs/vdr-vnsiserver3 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,29 +24,69 @@ include Config -VER = plugin +VER = 0.9.0 +THISAPP = vdr-vnsiserver3 +DL_FILE = $(THISAPP).tar.xz -THISAPP = vdr_epgsearch-$(VER) +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -PROG = vdr_epgsearch -PAK_VER = 5 +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = vdr-vnsiserver3 +PAK_VER = 1 DEPS = "vdr" +VDR_VER = 1.7.41 + ############################################################################### # Top-level Rules ############################################################################### +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -install : +$(DL_FILE)_MD5 = 159a36577ea50d9772fcf5a92ffd38b5 -check : +install : $(TARGET) -download : +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) -md5 : +download : $(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) dist: - $(PAK) + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) ############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ + 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 644 vnsiserver/* /etc/vdr/plugins/vnsiserver + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 359542143..2cba3505b 100755 --- a/make.sh +++ b/make.sh @@ -664,6 +664,9 @@ buildipfire() { ipfiremake faad2 ipfiremake ffmpeg ipfiremake vdr + ipfiremake vdr-streamdev + ipfiremake vdr-vnsiserver3 + ipfiremake vdr-epgsearch ipfiremake w_scan ipfiremake icecast ipfiremake icegenerator diff --git a/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch b/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch new file mode 100644 index 000000000..d8319c0af --- /dev/null +++ b/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch @@ -0,0 +1,82 @@ +diff -up epgsearch-1.0.1.beta2/epgsearch.c~ epgsearch-1.0.1.beta2/epgsearch.c +--- epgsearch-1.0.1.beta2/epgsearch.c~ 2012-06-11 20:01:54.000000000 +0300 ++++ epgsearch-1.0.1.beta2/epgsearch.c 2012-06-12 22:20:38.740086339 +0300 +@@ -446,16 +446,16 @@ bool cPluginEpgsearch::Start(void) + LoadConfD(); + LoadUserVars(); + +- ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true); +- Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf")); +- SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf")); +- SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf")); +- RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data")); +- SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf")); +- NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf")); +- DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf")); +- TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf")); +- PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf")); ++ ChannelGroups.Load("/var/lib/vdr/data/epgsearch/epgsearchchangrps.conf", true); ++ Blacklists.Load("/var/lib/vdr/data/epgsearch/epgsearchblacklists.conf"); ++ SearchExts.Load("/var/lib/vdr/data/epgsearch/epgsearch.conf"); ++ SearchTemplates.Load("/var/lib/vdr/data/epgsearch/epgsearchtemplates.conf"); ++ RecsDone.Load("/var/lib/vdr/data/epgsearch/epgsearchdone.data"); ++ SwitchTimers.Load("/var/lib/vdr/data/epgsearch/epgsearchswitchtimers.conf"); ++ NoAnnounces.Load("/var/lib/vdr/data/epgsearch/noannounce.conf"); ++ DefTimerCheckModes.Load("/var/lib/vdr/data/epgsearch/deftimerchkmodes.conf"); ++ TimersDone.Load("/var/lib/vdr/data/epgsearch/timersdone.conf"); ++ PendingNotifications.Load("/var/lib/vdr/data/epgsearch/pendingnotifications.conf"); + + cSearchTimerThread::Init(this); + cSwitchTimerThread::Init(); +diff -up epgsearch-1.0.1.beta2/epgsearchcfg.c~ epgsearch-1.0.1.beta2/epgsearchcfg.c +--- epgsearch-1.0.1.beta2/epgsearchcfg.c~ 2012-06-11 19:43:52.000000000 +0300 ++++ epgsearch-1.0.1.beta2/epgsearchcfg.c 2012-06-12 22:20:39.169055465 +0300 +@@ -80,7 +80,7 @@ cEPGSearchConfig::cEPGSearchConfig(void) + strcpy(MailAuthUser, ""); + strcpy(MailAuthPass, ""); + strcpy(LastMailConflicts, ""); +- mailViaScript = 1; ++ mailViaScript = 0; + manualTimerCheckDefault = 0; + noAnnounceWhileReplay = 0; + TimerProgRepeat = 0; +diff -up epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ epgsearch-1.0.1.beta2/scripts/recordingdone.sh +--- epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ 2012-06-12 22:19:28.570878733 +0300 ++++ epgsearch-1.0.1.beta2/scripts/recordingdone.sh 2012-06-12 22:20:39.536029167 +0300 +@@ -60,10 +60,10 @@ CTIME_FROM_RECORDING=yes + SVDRPSEND=svdrpsend + + # Home of EPGsearch +-EPGSEARCH_HOME="/etc/vdr/plugins" ++EPGSEARCH_HOME="/var/lib/vdr/data/epgsearch" + + # Video root +-VIDEO_ROOT="/video" ++VIDEO_ROOT="/var/video" + + # do not edit below this line + #------------------------------------------------------------------------------ +diff -up epgsearch-1.0.1.beta2/scripts/recrep.sh~ epgsearch-1.0.1.beta2/scripts/recrep.sh +--- epgsearch-1.0.1.beta2/scripts/recrep.sh~ 2012-06-11 19:43:51.000000000 +0300 ++++ epgsearch-1.0.1.beta2/scripts/recrep.sh 2012-06-12 22:20:39.914002061 +0300 +@@ -15,7 +15,7 @@ + # adjust the following lines to your config + + # your plugins config dir +-PLUGINCONFDIR=/var/lib/vdr/plugins/epgsearch ++PLUGINCONFDIR=/etc/vdr/plugins/epgsearch + # path to svdrpsend + SVDRPSEND=svdrpsend + # the key used to call epgsearch +diff -up epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh +--- epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ 2012-06-11 19:43:51.000000000 +0300 ++++ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh 2012-06-12 22:20:40.723944345 +0300 +@@ -15,7 +15,7 @@ + # + + # Your timers.conf +-TIMERS="/video/timers.conf" ++TIMERS="/etc/vdr/timers.conf" + + # + -- 2.39.2