vdr: update to version 2.6.9

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/packages/vdr_dvbapi b/config/rootfiles/packages/vdr_dvbapi
index c6892374da233dc3fcd0c181fec8a1b3c10157ee..27e10dc923856a16f7df11ac0e2ae1244aa8621a 100644 (file)
--- a/config/rootfiles/packages/vdr_dvbapi
+++ b/config/rootfiles/packages/vdr_dvbapi
@@ -1,3 +1,3 @@
 etc/sysconfig/vdr-plugins.d/dvbapi.conf
 etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.6.6
+usr/lib/vdr/libvdr-dvbapi.so.2.6.9

diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/vdr_eepg
index 61f13c812aa7ed785606daf4e16cbbc89dad0f6a..13b14b3c969f8d9c191fc2be823ceedfdb431be6 100644 (file)
--- a/config/rootfiles/packages/vdr_eepg
+++ b/config/rootfiles/packages/vdr_eepg
@@ -1,2 +1,2 @@
 etc/vdr/plugins/eepg
-usr/lib/vdr/libvdr-eepg.so.2.6.6
+usr/lib/vdr/libvdr-eepg.so.2.6.9

diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch
index 765f8fa7efad86736e868ff56e0e1c41409fa4a7..93ef0dc3a3df53f753915814322a0880058393b9 100644 (file)
--- 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.6.6
-usr/lib/vdr/libvdr-epgsearch.so.2.6.6
-usr/lib/vdr/libvdr-epgsearchonly.so.2.6.6
-usr/lib/vdr/libvdr-quickepgsearch.so.2.6.6
+usr/lib/vdr/libvdr-conflictcheckonly.so.2.6.9
+usr/lib/vdr/libvdr-epgsearch.so.2.6.9
+usr/lib/vdr/libvdr-epgsearchonly.so.2.6.9
+usr/lib/vdr/libvdr-quickepgsearch.so.2.6.9
 #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
index 8e631a3fd0af4b98fb597e2b0b6c23acfd91394d..03a648d7834a828594ffe40fec474c4c8d2a4ac9 100644 (file)
--- a/config/rootfiles/packages/vdr_streamdev
+++ b/config/rootfiles/packages/vdr_streamdev
@@ -4,4 +4,4 @@ etc/vdr/plugins/streamdev-server
 etc/vdr/plugins/streamdev-server/streamdevhosts.conf
 #usr/lib/vdr/bin
 usr/lib/vdr/bin/externremux.sh
-usr/lib/vdr/libvdr-streamdev-server.so.2.6.6
+usr/lib/vdr/libvdr-streamdev-server.so.2.6.9

diff --git a/lfs/vdr b/lfs/vdr
index 41dd4e92dd3bc3b1242ff7422dc23dc847de6e39..f1aa5d0b2e8b6af5f84fade4a68b9dd0e1bd5a31 100644 (file)
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -26,20 +26,20 @@ include Config
 
 SUMMARY    = Video Disk Recorder
 
-VER        = 2.6.6
+VER        = 2.6.9
 
 # VDRPLUGVER must match with APIVERSION! in config.h
 # after change this update also all vdr plugins
-VDRPLUGVER = 2.6.6
+VDRPLUGVER = 2.6.9
 
 THISAPP    = vdr-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
-PAK_VER    = 17
+PAK_VER    = 18
 
 DEPS       = vdr_streamdev
 
@@ -71,7 +71,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 22ad6d0d4048347ff16a48ad137900f32dda7adfc7fb54bb1501f14cfc426185f942ffa4997de1e0318ca8c6b67a7dfc48d49b30bfda9367d7337b2d601544fc
+$(DL_FILE)_BLAKE2 = 50d7380be2a9d1d9176c7c3a503e8d2e12086dc82d96b04ddcff15cebc95115389e460b44f3da41e363ca55697f3c2c16764e54492e6a58a723f7dbcb36450c3
 
 install : $(TARGET)
 
@@ -103,7 +103,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
        # Compile main package.
        cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir

diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi
index d36f75d69f6f91e0233bdf27f445ac6e444c2b1c..39402b09fa63d0f395252467d0f13f61316b3164 100644 (file)
--- a/lfs/vdr_dvbapi
+++ b/lfs/vdr_dvbapi
@@ -35,13 +35,13 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_dvbapi
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       =
 
 SERVICES   =
 
-VDRPLUGVER = 2.6.6
+VDRPLUGVER = 2.6.9
 
 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)

diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg
index 61c156da318a32b074de6eb614859945410aeb26..982cf667a229d76c7e7d31e70ffe4ced9b492a06 100644 (file)
--- a/lfs/vdr_eepg
+++ b/lfs/vdr_eepg
@@ -38,13 +38,13 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_eepg
-PAK_VER    = 6
+PAK_VER    = 7
 
 DEPS       =
 
 SERVICES   =
 
-VDRPLUGVER = 2.6.6
+VDRPLUGVER = 2.6.9
 
 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)

diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch
index dceea2cc878d38bfb689bf9cf888135fc3630de8..48efc38cce292c016478646ce90cd755e9033b8f 100644 (file)
--- a/lfs/vdr_epgsearch
+++ b/lfs/vdr_epgsearch
@@ -35,13 +35,13 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_epgsearch
-PAK_VER    = 12
+PAK_VER    = 13
 
 DEPS       =
 
 SERVICES   =
 
-VDRPLUGVER = 2.6.6
+VDRPLUGVER = 2.6.9
 
 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)

diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev
index af13b392b2c8cf71a3f23229d915c59d0fdb5071..eafef6918222409af37349eb936489eabba5fa3f 100644 (file)
--- a/lfs/vdr_streamdev
+++ b/lfs/vdr_streamdev
@@ -35,13 +35,13 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_streamdev
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       =
 
 SERVICES   =
 
-VDRPLUGVER = 2.6.6
+VDRPLUGVER = 2.6.9
 
 EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
 CFLAGS    += $(EXTRA_FLAGS)