tried some vdr enhancements

fixed urlfilter bug

diff --git a/config/rootfiles/packages/vdr b/config/rootfiles/packages/vdr
index dd0cca069fa996d44fc79c8afe179eb5b63d0257..4e2a9743e212c1542b6e636e20cf90e8e4c3154d 100644 (file)
--- a/config/rootfiles/packages/vdr
+++ b/config/rootfiles/packages/vdr
@@ -1,11 +1,15 @@
 #opt/vdr
 #opt/vdr/PLUGINS
 #opt/vdr/PLUGINS/lib
+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-hello.so.1.6.0
 opt/vdr/PLUGINS/lib/libvdr-osddemo.so.1.6.0
 opt/vdr/PLUGINS/lib/libvdr-pictures.so.1.6.0
 opt/vdr/PLUGINS/lib/libvdr-skincurses.so.1.6.0
 opt/vdr/PLUGINS/lib/libvdr-sky.so.1.6.0
+opt/vdr/PLUGINS/lib/libvdr-softdevice.so.1.6.0
 opt/vdr/PLUGINS/lib/libvdr-status.so.1.6.0
 opt/vdr/PLUGINS/lib/libvdr-streamdev-client.so.1.6.0
 opt/vdr/PLUGINS/lib/libvdr-streamdev-server.so.1.6.0
@@ -14,6 +18,7 @@ opt/vdr/PLUGINS/lib/libvdr-svcsvr.so.1.6.0
 opt/vdr/PLUGINS/lib/libvdr-svdrpdemo.so.1.6.0
 #opt/vdr/bin
 opt/vdr/bin/runvdr
+opt/vdr/bin/runvdr-soft
 opt/vdr/bin/svdrpsend.pl
 opt/vdr/bin/vdr
 #opt/vdr/locale

diff --git a/config/rootfiles/updater/filelists/core16 b/config/rootfiles/updater/filelists/core16
index ec3a2566c336910632e5f34f480436cd6d5a1b72..439f6c5e80f24ae0bde6a754851f0843ef8afe21 100644 (file)
--- a/config/rootfiles/updater/filelists/core16
+++ b/config/rootfiles/updater/filelists/core16
@@ -14,6 +14,7 @@ srv/web/ipfire/cgi-bin/network.cgi
 srv/web/ipfire/cgi-bin/graphs.cgi
 srv/web/ipfire/cgi-bin/system.cgi
 srv/web/ipfire/cgi-bin/outgoingfw.cgi
+srv/web/ipfire/cgi-bin/urlfilter.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 var/ipfire/langs
 var/ipfire/graphs.pl

diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index 5713cd55b2591837d29e4c9c157e0b5a688f92c7..5ae2d8dc7a74b74e021934e595d7a5683b6fbf5e 100644 (file)
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -2556,7 +2556,7 @@ sub readblockcategories
        @filtergroups = @categories;
 
        foreach (@filtergroups) {
-               s/\//_SLASH_/g;
+               s/\//_/g;
                tr/a-z/A-Z/;
                $_ = "FILTER_".$_;
        }

diff --git a/lfs/vdr b/lfs/vdr
index 14b2514837805a5eeab3a45c7f51c507d9fe0235..9ace068550d06caae0439a157e8066b6fbcf44af 100644 (file)
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -29,13 +29,13 @@ THISAPP    = vdr-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FILE1   = vdr-streamdev-20080325-http-0_4.tgz
 DL_FILE2   = vdr-softdevice-cvs-2008-04-16.tar.bz2
-
+DL_FILE3   = vidix-1.0.0.tar.bz2
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = "freefont fontconfig"
 
@@ -52,6 +52,8 @@ $(DL_FILE2) = $(DL_FROM)/$(DL_FILE2)
 $(DL_FILE)_MD5 = 76f4ebe6525a35e33313d27a3f8e80c0
 $(DL_FILE1)_MD5 = 874026c643601692077c42ee7a70b720
 $(DL_FILE2)_MD5 = 2b2eec38a653c205967849efb907b707
+$(DL_FILE3)_MD5 = 3471d1f385871f7e00e6e178ccdfff0b
+
 
 install : $(TARGET)
 
@@ -89,8 +91,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP)/PLUGINS/src && tar jxf $(DIR_DL)/$(DL_FILE2)
        cd $(DIR_APP)/PLUGINS/src && ln -s softdevice-cvs-2008-04-16 softdevice
        cd $(DIR_APP)/PLUGINS/src/softdevice && ./configure
+       cd $(DIR_APP)/PLUGINS/src && tar jxf $(DIR_DL)/$(DL_FILE3)
+       cd $(DIR_APP)/PLUGINS/src && ln -s vidix-1.0.0 vidix
+       cd $(DIR_APP)/PLUGINS/src/vidix && ./configure
        cd $(DIR_APP) && make VIDEODIR=/var/video plugins $(MAKETUNING)
        cd $(DIR_APP) && make VIDEODIR=/var/video vdr $(MAKETUNING)
+       cd $(DIR_APP) && make DFB_SUPPORT=1  FB_SUPPORT=1  VIDIX_SUPPORT=1  $(MAKETUNING)
        cd $(DIR_APP) && make PREFIX=. DESTDIR=/opt/vdr/ install
        -mkdir -p /opt/vdr/etc
        cd $(DIR_APP) && install *.conf /opt/vdr/etc/