* [PATCH 05/14] Drop DirectFB
2020-02-12 9:34 Drop unused/unmaintained packages Michael Tremer
` (3 preceding siblings ...)
2020-02-12 9:34 ` [PATCH 04/14] Drop check_mk_agent Michael Tremer
@ 2020-02-12 9:34 ` Michael Tremer
2020-02-12 9:34 ` [PATCH 06/14] Drop ez-ipupdate Michael Tremer
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: Michael Tremer @ 2020-02-12 9:34 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 163397 bytes --]
This package is not very useful on its own and nobody
seems to pull this as dependency any more.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/packages/aarch64/directfb | 391 ----
config/rootfiles/packages/armv5tel/directfb | 402 ----
config/rootfiles/packages/armv7hl/directfb | 402 ----
config/rootfiles/packages/i586/directfb | 397 ----
config/rootfiles/packages/x86_64/directfb | 397 ----
lfs/directfb | 93 -
make.sh | 1 -
...ctFB-1.7.7-add-missing-davinci-files.patch | 1717 -----------------
src/patches/DirectFB-1.7.7-fix_mknod.patch | 22 -
9 files changed, 3822 deletions(-)
delete mode 100644 config/rootfiles/packages/aarch64/directfb
delete mode 100644 config/rootfiles/packages/armv5tel/directfb
delete mode 100644 config/rootfiles/packages/armv7hl/directfb
delete mode 100644 config/rootfiles/packages/i586/directfb
delete mode 100644 config/rootfiles/packages/x86_64/directfb
delete mode 100644 lfs/directfb
delete mode 100644 src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch
delete mode 100644 src/patches/DirectFB-1.7.7-fix_mknod.patch
diff --git a/config/rootfiles/packages/aarch64/directfb b/config/rootfiles/packages/aarch64/directfb
deleted file mode 100644
index a3004e5fa..000000000
--- a/config/rootfiles/packages/aarch64/directfb
+++ /dev/null
@@ -1,391 +0,0 @@
-usr/bin/dfbdump
-usr/bin/dfbdumpinput
-usr/bin/dfbfx
-usr/bin/dfbg
-usr/bin/dfbinfo
-usr/bin/dfbinput
-usr/bin/dfbinspector
-usr/bin/dfblayer
-usr/bin/dfbmaster
-usr/bin/dfbpenmount
-usr/bin/dfbplay
-usr/bin/dfbscreen
-usr/bin/dfbshow
-usr/bin/dfbswitch
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/bin/mkdfiff
-usr/bin/mkdgiff
-usr/bin/mkdgifft
-usr/bin/pxa3xx_dump
-#usr/include/++dfb
-#usr/include/++dfb/++dfb.h
-#usr/include/++dfb/++dfb_mangle.h
-#usr/include/++dfb/++dfb_unmangle.h
-#usr/include/++dfb/idirectfb.h
-#usr/include/++dfb/idirectfbdatabuffer.h
-#usr/include/++dfb/idirectfbdisplaylayer.h
-#usr/include/++dfb/idirectfbeventbuffer.h
-#usr/include/++dfb/idirectfbfont.h
-#usr/include/++dfb/idirectfbimageprovider.h
-#usr/include/++dfb/idirectfbinputdevice.h
-#usr/include/++dfb/idirectfbpalette.h
-#usr/include/++dfb/idirectfbscreen.h
-#usr/include/++dfb/idirectfbsurface.h
-#usr/include/++dfb/idirectfbvideoprovider.h
-#usr/include/++dfb/idirectfbwindow.h
-#usr/include/directfb
-#usr/include/directfb-internal
-#usr/include/directfb-internal/core
-#usr/include/directfb-internal/core/CoreDFB.h
-#usr/include/directfb-internal/core/CoreDFB_CallMode.h
-#usr/include/directfb-internal/core/CoreDFB_includes.h
-#usr/include/directfb-internal/core/CoreGraphicsState.h
-#usr/include/directfb-internal/core/CoreGraphicsStateClient.h
-#usr/include/directfb-internal/core/CoreGraphicsState_includes.h
-#usr/include/directfb-internal/core/CoreInputDevice.h
-#usr/include/directfb-internal/core/CoreInputDevice_includes.h
-#usr/include/directfb-internal/core/CoreLayer.h
-#usr/include/directfb-internal/core/CoreLayerContext.h
-#usr/include/directfb-internal/core/CoreLayerContext_includes.h
-#usr/include/directfb-internal/core/CoreLayerRegion.h
-#usr/include/directfb-internal/core/CoreLayerRegion_includes.h
-#usr/include/directfb-internal/core/CoreLayer_includes.h
-#usr/include/directfb-internal/core/CorePalette.h
-#usr/include/directfb-internal/core/CorePalette_includes.h
-#usr/include/directfb-internal/core/CoreScreen.h
-#usr/include/directfb-internal/core/CoreScreen_includes.h
-#usr/include/directfb-internal/core/CoreSlave.h
-#usr/include/directfb-internal/core/CoreSlave_includes.h
-#usr/include/directfb-internal/core/CoreSurface.h
-#usr/include/directfb-internal/core/CoreSurfaceClient.h
-#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h
-#usr/include/directfb-internal/core/CoreSurface_includes.h
-#usr/include/directfb-internal/core/CoreWindow.h
-#usr/include/directfb-internal/core/CoreWindowStack.h
-#usr/include/directfb-internal/core/CoreWindowStack_includes.h
-#usr/include/directfb-internal/core/CoreWindow_includes.h
-#usr/include/directfb-internal/core/Debug.h
-#usr/include/directfb-internal/core/DisplayTask.h
-#usr/include/directfb-internal/core/Fifo.h
-#usr/include/directfb-internal/core/Interface.h
-#usr/include/directfb-internal/core/PacketBuffer.h
-#usr/include/directfb-internal/core/Renderer.h
-#usr/include/directfb-internal/core/SurfaceTask.h
-#usr/include/directfb-internal/core/Task.h
-#usr/include/directfb-internal/core/TaskManager.h
-#usr/include/directfb-internal/core/TaskThreadsQ.h
-#usr/include/directfb-internal/core/Util.h
-#usr/include/directfb-internal/core/clipboard.h
-#usr/include/directfb-internal/core/colorhash.h
-#usr/include/directfb-internal/core/core.h
-#usr/include/directfb-internal/core/core_parts.h
-#usr/include/directfb-internal/core/core_strings.h
-#usr/include/directfb-internal/core/core_system.h
-#usr/include/directfb-internal/core/coredefs.h
-#usr/include/directfb-internal/core/coretypes.h
-#usr/include/directfb-internal/core/fonts.h
-#usr/include/directfb-internal/core/gfxcard.h
-#usr/include/directfb-internal/core/graphics_driver.h
-#usr/include/directfb-internal/core/graphics_state.h
-#usr/include/directfb-internal/core/input.h
-#usr/include/directfb-internal/core/input_driver.h
-#usr/include/directfb-internal/core/input_hub.h
-#usr/include/directfb-internal/core/layer_context.h
-#usr/include/directfb-internal/core/layer_control.h
-#usr/include/directfb-internal/core/layer_region.h
-#usr/include/directfb-internal/core/layers.h
-#usr/include/directfb-internal/core/layers_internal.h
-#usr/include/directfb-internal/core/palette.h
-#usr/include/directfb-internal/core/screen.h
-#usr/include/directfb-internal/core/screens.h
-#usr/include/directfb-internal/core/screens_internal.h
-#usr/include/directfb-internal/core/state.h
-#usr/include/directfb-internal/core/surface.h
-#usr/include/directfb-internal/core/surface_allocation.h
-#usr/include/directfb-internal/core/surface_buffer.h
-#usr/include/directfb-internal/core/surface_client.h
-#usr/include/directfb-internal/core/surface_core.h
-#usr/include/directfb-internal/core/surface_pool.h
-#usr/include/directfb-internal/core/surface_pool_bridge.h
-#usr/include/directfb-internal/core/system.h
-#usr/include/directfb-internal/core/windows.h
-#usr/include/directfb-internal/core/windows_internal.h
-#usr/include/directfb-internal/core/windowstack.h
-#usr/include/directfb-internal/core/wm.h
-#usr/include/directfb-internal/core/wm_module.h
-#usr/include/directfb-internal/devmem
-#usr/include/directfb-internal/devmem/devmem.h
-#usr/include/directfb-internal/devmem/surfacemanager.h
-#usr/include/directfb-internal/display
-#usr/include/directfb-internal/display/idirectfbdisplaylayer.h
-#usr/include/directfb-internal/display/idirectfbpalette.h
-#usr/include/directfb-internal/display/idirectfbscreen.h
-#usr/include/directfb-internal/display/idirectfbsurface.h
-#usr/include/directfb-internal/display/idirectfbsurface_layer.h
-#usr/include/directfb-internal/display/idirectfbsurface_window.h
-#usr/include/directfb-internal/dummy
-#usr/include/directfb-internal/dummy/dummy.h
-#usr/include/directfb-internal/fbdev
-#usr/include/directfb-internal/fbdev/agp.h
-#usr/include/directfb-internal/fbdev/fb.h
-#usr/include/directfb-internal/fbdev/fbdev.h
-#usr/include/directfb-internal/fbdev/surfacemanager.h
-#usr/include/directfb-internal/fbdev/vt.h
-#usr/include/directfb-internal/gfx
-#usr/include/directfb-internal/gfx/clip.h
-#usr/include/directfb-internal/gfx/convert.h
-#usr/include/directfb-internal/gfx/generic
-#usr/include/directfb-internal/gfx/generic/generic.h
-#usr/include/directfb-internal/gfx/util.h
-#usr/include/directfb-internal/idirectfb.h
-#usr/include/directfb-internal/init.h
-#usr/include/directfb-internal/input
-#usr/include/directfb-internal/input/idirectfbinputbuffer.h
-#usr/include/directfb-internal/input/idirectfbinputdevice.h
-#usr/include/directfb-internal/media
-#usr/include/directfb-internal/media/idirectfbdatabuffer.h
-#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h
-#usr/include/directfb-internal/media/idirectfbfont.h
-#usr/include/directfb-internal/media/idirectfbimageprovider.h
-#usr/include/directfb-internal/media/idirectfbimageprovider_client.h
-#usr/include/directfb-internal/media/idirectfbvideoprovider.h
-#usr/include/directfb-internal/misc
-#usr/include/directfb-internal/misc/conf.h
-#usr/include/directfb-internal/misc/gfx_util.h
-#usr/include/directfb-internal/misc/util.h
-#usr/include/directfb-internal/windows
-#usr/include/directfb-internal/windows/idirectfbwindow.h
-#usr/include/directfb/dfb_types.h
-#usr/include/directfb/dfiff.h
-#usr/include/directfb/dgiff.h
-#usr/include/directfb/direct
-#usr/include/directfb/direct/Lists.h
-#usr/include/directfb/direct/LockWQ.h
-#usr/include/directfb/direct/Magic.h
-#usr/include/directfb/direct/Mutex.h
-#usr/include/directfb/direct/Performer.h
-#usr/include/directfb/direct/String.h
-#usr/include/directfb/direct/TLSObject.h
-#usr/include/directfb/direct/ToString.h
-#usr/include/directfb/direct/Types++.h
-#usr/include/directfb/direct/atomic.h
-#usr/include/directfb/direct/build.h
-#usr/include/directfb/direct/clock.h
-#usr/include/directfb/direct/compiler.h
-#usr/include/directfb/direct/conf.h
-#usr/include/directfb/direct/debug.h
-#usr/include/directfb/direct/direct.h
-#usr/include/directfb/direct/fastlz.h
-#usr/include/directfb/direct/fifo.h
-#usr/include/directfb/direct/filesystem.h
-#usr/include/directfb/direct/flz.h
-#usr/include/directfb/direct/hash.h
-#usr/include/directfb/direct/init.h
-#usr/include/directfb/direct/interface.h
-#usr/include/directfb/direct/interface_implementation.h
-#usr/include/directfb/direct/list.h
-#usr/include/directfb/direct/log.h
-#usr/include/directfb/direct/log_domain.h
-#usr/include/directfb/direct/map.h
-#usr/include/directfb/direct/mem.h
-#usr/include/directfb/direct/memcpy.h
-#usr/include/directfb/direct/messages.h
-#usr/include/directfb/direct/modules.h
-#usr/include/directfb/direct/os
-#usr/include/directfb/direct/os/clock.h
-#usr/include/directfb/direct/os/filesystem.h
-#usr/include/directfb/direct/os/linux
-#usr/include/directfb/direct/os/linux/glibc
-#usr/include/directfb/direct/os/linux/glibc/filesystem.h
-#usr/include/directfb/direct/os/linux/glibc/mutex.h
-#usr/include/directfb/direct/os/linux/glibc/thread.h
-#usr/include/directfb/direct/os/linux/glibc/types.h
-#usr/include/directfb/direct/os/linux/glibc/waitqueue.h
-#usr/include/directfb/direct/os/log.h
-#usr/include/directfb/direct/os/mem.h
-#usr/include/directfb/direct/os/mutex.h
-#usr/include/directfb/direct/os/signals.h
-#usr/include/directfb/direct/os/system.h
-#usr/include/directfb/direct/os/thread.h
-#usr/include/directfb/direct/os/types.h
-#usr/include/directfb/direct/os/waitqueue.h
-#usr/include/directfb/direct/perf.h
-#usr/include/directfb/direct/print.h
-#usr/include/directfb/direct/processor.h
-#usr/include/directfb/direct/result.h
-#usr/include/directfb/direct/serial.h
-#usr/include/directfb/direct/signals.h
-#usr/include/directfb/direct/stream.h
-#usr/include/directfb/direct/system.h
-#usr/include/directfb/direct/thread.h
-#usr/include/directfb/direct/trace.h
-#usr/include/directfb/direct/tree.h
-#usr/include/directfb/direct/types.h
-#usr/include/directfb/direct/utf8.h
-#usr/include/directfb/direct/util.h
-#usr/include/directfb/direct/uuid.h
-#usr/include/directfb/directfb++.h
-#usr/include/directfb/directfb.h
-#usr/include/directfb/directfb_build.h
-#usr/include/directfb/directfb_graphics.h
-#usr/include/directfb/directfb_keyboard.h
-#usr/include/directfb/directfb_keynames.h
-#usr/include/directfb/directfb_strings.h
-#usr/include/directfb/directfb_util.h
-#usr/include/directfb/directfb_version.h
-#usr/include/directfb/directfb_water.h
-#usr/include/directfb/directfb_water_strings.h
-#usr/include/directfb/directfb_windows.h
-#usr/include/directfb/directfbgl.h
-#usr/include/directfb/directfbgl2.h
-#usr/include/directfb/fusion
-#usr/include/directfb/fusion/Debug.h
-#usr/include/directfb/fusion/arena.h
-#usr/include/directfb/fusion/build.h
-#usr/include/directfb/fusion/call.h
-#usr/include/directfb/fusion/conf.h
-#usr/include/directfb/fusion/fusion.h
-#usr/include/directfb/fusion/fusion_internal.h
-#usr/include/directfb/fusion/hash.h
-#usr/include/directfb/fusion/init.h
-#usr/include/directfb/fusion/lock.h
-#usr/include/directfb/fusion/object.h
-#usr/include/directfb/fusion/property.h
-#usr/include/directfb/fusion/protocol.h
-#usr/include/directfb/fusion/reactor.h
-#usr/include/directfb/fusion/ref.h
-#usr/include/directfb/fusion/shm
-#usr/include/directfb/fusion/shm/pool.h
-#usr/include/directfb/fusion/shm/shm.h
-#usr/include/directfb/fusion/shm/shm_internal.h
-#usr/include/directfb/fusion/shmalloc.h
-#usr/include/directfb/fusion/types.h
-#usr/include/directfb/fusion/vector.h
-#usr/lib/directfb-1.7-7
-#usr/lib/directfb-1.7-7/gfxdrivers
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so
-#usr/lib/directfb-1.7-7/inputdrivers
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so
-#usr/lib/directfb-1.7-7/interfaces
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so
-#usr/lib/directfb-1.7-7/interfaces/IWater
-#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la
-usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so
-#usr/lib/directfb-1.7-7/systems
-#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so
-#usr/lib/directfb-1.7-7/wm
-#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la
-usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so
-usr/lib/lib++dfb-1.7.so.7
-usr/lib/lib++dfb-1.7.so.7.0.0
-#usr/lib/lib++dfb.la
-#usr/lib/lib++dfb.so
-usr/lib/libdirect-1.7.so.7
-usr/lib/libdirect-1.7.so.7.0.0
-#usr/lib/libdirect.la
-#usr/lib/libdirect.so
-usr/lib/libdirectfb-1.7.so.7
-usr/lib/libdirectfb-1.7.so.7.0.0
-#usr/lib/libdirectfb.la
-#usr/lib/libdirectfb.so
-usr/lib/libfusion-1.7.so.7
-usr/lib/libfusion-1.7.so.7.0.0
-#usr/lib/libfusion.la
-#usr/lib/libfusion.so
-#usr/lib/pkgconfig/++dfb.pc
-#usr/lib/pkgconfig/direct.pc
-#usr/lib/pkgconfig/directfb-internal.pc
-#usr/lib/pkgconfig/directfb.pc
-#usr/lib/pkgconfig/fusion.pc
-#usr/share/directfb-1.7.7
-usr/share/directfb-1.7.7/cursor.dat
-usr/share/directfb-1.7.7/cursor.png
-usr/share/directfb-1.7.7/decker.dgiff
-usr/share/directfb-1.7.7/decker.ttf
-#usr/share/man/man1/dfbg.1
-#usr/share/man/man1/directfb-csource.1
-#usr/share/man/man5/directfbrc.5
diff --git a/config/rootfiles/packages/armv5tel/directfb b/config/rootfiles/packages/armv5tel/directfb
deleted file mode 100644
index d77367ba0..000000000
--- a/config/rootfiles/packages/armv5tel/directfb
+++ /dev/null
@@ -1,402 +0,0 @@
-usr/bin/c64xdump
-usr/bin/dfbdump
-usr/bin/dfbdumpinput
-usr/bin/dfbfx
-usr/bin/dfbg
-usr/bin/dfbinfo
-usr/bin/dfbinput
-usr/bin/dfbinspector
-usr/bin/dfblayer
-usr/bin/dfbmaster
-usr/bin/dfbpenmount
-usr/bin/dfbplay
-usr/bin/dfbscreen
-usr/bin/dfbshow
-usr/bin/dfbswitch
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/bin/mkdfiff
-usr/bin/mkdgiff
-usr/bin/mkdgifft
-usr/bin/pxa3xx_dump
-#usr/include/++dfb
-#usr/include/++dfb/++dfb.h
-#usr/include/++dfb/++dfb_mangle.h
-#usr/include/++dfb/++dfb_unmangle.h
-#usr/include/++dfb/idirectfb.h
-#usr/include/++dfb/idirectfbdatabuffer.h
-#usr/include/++dfb/idirectfbdisplaylayer.h
-#usr/include/++dfb/idirectfbeventbuffer.h
-#usr/include/++dfb/idirectfbfont.h
-#usr/include/++dfb/idirectfbimageprovider.h
-#usr/include/++dfb/idirectfbinputdevice.h
-#usr/include/++dfb/idirectfbpalette.h
-#usr/include/++dfb/idirectfbscreen.h
-#usr/include/++dfb/idirectfbsurface.h
-#usr/include/++dfb/idirectfbvideoprovider.h
-#usr/include/++dfb/idirectfbwindow.h
-#usr/include/directfb
-#usr/include/directfb-internal
-#usr/include/directfb-internal/core
-#usr/include/directfb-internal/core/CoreDFB.h
-#usr/include/directfb-internal/core/CoreDFB_CallMode.h
-#usr/include/directfb-internal/core/CoreDFB_includes.h
-#usr/include/directfb-internal/core/CoreGraphicsState.h
-#usr/include/directfb-internal/core/CoreGraphicsStateClient.h
-#usr/include/directfb-internal/core/CoreGraphicsState_includes.h
-#usr/include/directfb-internal/core/CoreInputDevice.h
-#usr/include/directfb-internal/core/CoreInputDevice_includes.h
-#usr/include/directfb-internal/core/CoreLayer.h
-#usr/include/directfb-internal/core/CoreLayerContext.h
-#usr/include/directfb-internal/core/CoreLayerContext_includes.h
-#usr/include/directfb-internal/core/CoreLayerRegion.h
-#usr/include/directfb-internal/core/CoreLayerRegion_includes.h
-#usr/include/directfb-internal/core/CoreLayer_includes.h
-#usr/include/directfb-internal/core/CorePalette.h
-#usr/include/directfb-internal/core/CorePalette_includes.h
-#usr/include/directfb-internal/core/CoreScreen.h
-#usr/include/directfb-internal/core/CoreScreen_includes.h
-#usr/include/directfb-internal/core/CoreSlave.h
-#usr/include/directfb-internal/core/CoreSlave_includes.h
-#usr/include/directfb-internal/core/CoreSurface.h
-#usr/include/directfb-internal/core/CoreSurfaceClient.h
-#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h
-#usr/include/directfb-internal/core/CoreSurface_includes.h
-#usr/include/directfb-internal/core/CoreWindow.h
-#usr/include/directfb-internal/core/CoreWindowStack.h
-#usr/include/directfb-internal/core/CoreWindowStack_includes.h
-#usr/include/directfb-internal/core/CoreWindow_includes.h
-#usr/include/directfb-internal/core/Debug.h
-#usr/include/directfb-internal/core/DisplayTask.h
-#usr/include/directfb-internal/core/Fifo.h
-#usr/include/directfb-internal/core/Interface.h
-#usr/include/directfb-internal/core/PacketBuffer.h
-#usr/include/directfb-internal/core/Renderer.h
-#usr/include/directfb-internal/core/SurfaceTask.h
-#usr/include/directfb-internal/core/Task.h
-#usr/include/directfb-internal/core/TaskManager.h
-#usr/include/directfb-internal/core/TaskThreadsQ.h
-#usr/include/directfb-internal/core/Util.h
-#usr/include/directfb-internal/core/clipboard.h
-#usr/include/directfb-internal/core/colorhash.h
-#usr/include/directfb-internal/core/core.h
-#usr/include/directfb-internal/core/core_parts.h
-#usr/include/directfb-internal/core/core_strings.h
-#usr/include/directfb-internal/core/core_system.h
-#usr/include/directfb-internal/core/coredefs.h
-#usr/include/directfb-internal/core/coretypes.h
-#usr/include/directfb-internal/core/fonts.h
-#usr/include/directfb-internal/core/gfxcard.h
-#usr/include/directfb-internal/core/graphics_driver.h
-#usr/include/directfb-internal/core/graphics_state.h
-#usr/include/directfb-internal/core/input.h
-#usr/include/directfb-internal/core/input_driver.h
-#usr/include/directfb-internal/core/input_hub.h
-#usr/include/directfb-internal/core/layer_context.h
-#usr/include/directfb-internal/core/layer_control.h
-#usr/include/directfb-internal/core/layer_region.h
-#usr/include/directfb-internal/core/layers.h
-#usr/include/directfb-internal/core/layers_internal.h
-#usr/include/directfb-internal/core/palette.h
-#usr/include/directfb-internal/core/screen.h
-#usr/include/directfb-internal/core/screens.h
-#usr/include/directfb-internal/core/screens_internal.h
-#usr/include/directfb-internal/core/state.h
-#usr/include/directfb-internal/core/surface.h
-#usr/include/directfb-internal/core/surface_allocation.h
-#usr/include/directfb-internal/core/surface_buffer.h
-#usr/include/directfb-internal/core/surface_client.h
-#usr/include/directfb-internal/core/surface_core.h
-#usr/include/directfb-internal/core/surface_pool.h
-#usr/include/directfb-internal/core/surface_pool_bridge.h
-#usr/include/directfb-internal/core/system.h
-#usr/include/directfb-internal/core/windows.h
-#usr/include/directfb-internal/core/windows_internal.h
-#usr/include/directfb-internal/core/windowstack.h
-#usr/include/directfb-internal/core/wm.h
-#usr/include/directfb-internal/core/wm_module.h
-#usr/include/directfb-internal/devmem
-#usr/include/directfb-internal/devmem/devmem.h
-#usr/include/directfb-internal/devmem/surfacemanager.h
-#usr/include/directfb-internal/display
-#usr/include/directfb-internal/display/idirectfbdisplaylayer.h
-#usr/include/directfb-internal/display/idirectfbpalette.h
-#usr/include/directfb-internal/display/idirectfbscreen.h
-#usr/include/directfb-internal/display/idirectfbsurface.h
-#usr/include/directfb-internal/display/idirectfbsurface_layer.h
-#usr/include/directfb-internal/display/idirectfbsurface_window.h
-#usr/include/directfb-internal/dummy
-#usr/include/directfb-internal/dummy/dummy.h
-#usr/include/directfb-internal/fbdev
-#usr/include/directfb-internal/fbdev/agp.h
-#usr/include/directfb-internal/fbdev/fb.h
-#usr/include/directfb-internal/fbdev/fbdev.h
-#usr/include/directfb-internal/fbdev/surfacemanager.h
-#usr/include/directfb-internal/fbdev/vt.h
-#usr/include/directfb-internal/gfx
-#usr/include/directfb-internal/gfx/clip.h
-#usr/include/directfb-internal/gfx/convert.h
-#usr/include/directfb-internal/gfx/generic
-#usr/include/directfb-internal/gfx/generic/generic.h
-#usr/include/directfb-internal/gfx/util.h
-#usr/include/directfb-internal/idirectfb.h
-#usr/include/directfb-internal/init.h
-#usr/include/directfb-internal/input
-#usr/include/directfb-internal/input/idirectfbinputbuffer.h
-#usr/include/directfb-internal/input/idirectfbinputdevice.h
-#usr/include/directfb-internal/media
-#usr/include/directfb-internal/media/idirectfbdatabuffer.h
-#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h
-#usr/include/directfb-internal/media/idirectfbfont.h
-#usr/include/directfb-internal/media/idirectfbimageprovider.h
-#usr/include/directfb-internal/media/idirectfbimageprovider_client.h
-#usr/include/directfb-internal/media/idirectfbvideoprovider.h
-#usr/include/directfb-internal/misc
-#usr/include/directfb-internal/misc/conf.h
-#usr/include/directfb-internal/misc/gfx_util.h
-#usr/include/directfb-internal/misc/util.h
-#usr/include/directfb-internal/windows
-#usr/include/directfb-internal/windows/idirectfbwindow.h
-#usr/include/directfb/dfb_types.h
-#usr/include/directfb/dfiff.h
-#usr/include/directfb/dgiff.h
-#usr/include/directfb/direct
-#usr/include/directfb/direct/Lists.h
-#usr/include/directfb/direct/LockWQ.h
-#usr/include/directfb/direct/Magic.h
-#usr/include/directfb/direct/Mutex.h
-#usr/include/directfb/direct/Performer.h
-#usr/include/directfb/direct/String.h
-#usr/include/directfb/direct/TLSObject.h
-#usr/include/directfb/direct/ToString.h
-#usr/include/directfb/direct/Types++.h
-#usr/include/directfb/direct/atomic.h
-#usr/include/directfb/direct/build.h
-#usr/include/directfb/direct/clock.h
-#usr/include/directfb/direct/compiler.h
-#usr/include/directfb/direct/conf.h
-#usr/include/directfb/direct/debug.h
-#usr/include/directfb/direct/direct.h
-#usr/include/directfb/direct/fastlz.h
-#usr/include/directfb/direct/fifo.h
-#usr/include/directfb/direct/filesystem.h
-#usr/include/directfb/direct/flz.h
-#usr/include/directfb/direct/hash.h
-#usr/include/directfb/direct/init.h
-#usr/include/directfb/direct/interface.h
-#usr/include/directfb/direct/interface_implementation.h
-#usr/include/directfb/direct/list.h
-#usr/include/directfb/direct/log.h
-#usr/include/directfb/direct/log_domain.h
-#usr/include/directfb/direct/map.h
-#usr/include/directfb/direct/mem.h
-#usr/include/directfb/direct/memcpy.h
-#usr/include/directfb/direct/messages.h
-#usr/include/directfb/direct/modules.h
-#usr/include/directfb/direct/os
-#usr/include/directfb/direct/os/clock.h
-#usr/include/directfb/direct/os/filesystem.h
-#usr/include/directfb/direct/os/linux
-#usr/include/directfb/direct/os/linux/glibc
-#usr/include/directfb/direct/os/linux/glibc/filesystem.h
-#usr/include/directfb/direct/os/linux/glibc/mutex.h
-#usr/include/directfb/direct/os/linux/glibc/thread.h
-#usr/include/directfb/direct/os/linux/glibc/types.h
-#usr/include/directfb/direct/os/linux/glibc/waitqueue.h
-#usr/include/directfb/direct/os/log.h
-#usr/include/directfb/direct/os/mem.h
-#usr/include/directfb/direct/os/mutex.h
-#usr/include/directfb/direct/os/signals.h
-#usr/include/directfb/direct/os/system.h
-#usr/include/directfb/direct/os/thread.h
-#usr/include/directfb/direct/os/types.h
-#usr/include/directfb/direct/os/waitqueue.h
-#usr/include/directfb/direct/perf.h
-#usr/include/directfb/direct/print.h
-#usr/include/directfb/direct/processor.h
-#usr/include/directfb/direct/result.h
-#usr/include/directfb/direct/serial.h
-#usr/include/directfb/direct/signals.h
-#usr/include/directfb/direct/stream.h
-#usr/include/directfb/direct/system.h
-#usr/include/directfb/direct/thread.h
-#usr/include/directfb/direct/trace.h
-#usr/include/directfb/direct/tree.h
-#usr/include/directfb/direct/types.h
-#usr/include/directfb/direct/utf8.h
-#usr/include/directfb/direct/util.h
-#usr/include/directfb/direct/uuid.h
-#usr/include/directfb/directfb++.h
-#usr/include/directfb/directfb.h
-#usr/include/directfb/directfb_build.h
-#usr/include/directfb/directfb_graphics.h
-#usr/include/directfb/directfb_keyboard.h
-#usr/include/directfb/directfb_keynames.h
-#usr/include/directfb/directfb_strings.h
-#usr/include/directfb/directfb_util.h
-#usr/include/directfb/directfb_version.h
-#usr/include/directfb/directfb_water.h
-#usr/include/directfb/directfb_water_strings.h
-#usr/include/directfb/directfb_windows.h
-#usr/include/directfb/directfbgl.h
-#usr/include/directfb/directfbgl2.h
-#usr/include/directfb/fusion
-#usr/include/directfb/fusion/Debug.h
-#usr/include/directfb/fusion/arena.h
-#usr/include/directfb/fusion/build.h
-#usr/include/directfb/fusion/call.h
-#usr/include/directfb/fusion/conf.h
-#usr/include/directfb/fusion/fusion.h
-#usr/include/directfb/fusion/fusion_internal.h
-#usr/include/directfb/fusion/hash.h
-#usr/include/directfb/fusion/init.h
-#usr/include/directfb/fusion/lock.h
-#usr/include/directfb/fusion/object.h
-#usr/include/directfb/fusion/property.h
-#usr/include/directfb/fusion/protocol.h
-#usr/include/directfb/fusion/reactor.h
-#usr/include/directfb/fusion/ref.h
-#usr/include/directfb/fusion/shm
-#usr/include/directfb/fusion/shm/pool.h
-#usr/include/directfb/fusion/shm/shm.h
-#usr/include/directfb/fusion/shm/shm_internal.h
-#usr/include/directfb/fusion/shmalloc.h
-#usr/include/directfb/fusion/types.h
-#usr/include/directfb/fusion/vector.h
-#usr/lib/directfb-1.7-7
-#usr/lib/directfb-1.7-7/gfxdrivers
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so
-#usr/lib/directfb-1.7-7/inputdrivers
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so
-#usr/lib/directfb-1.7-7/interfaces
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la
-usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so
-#usr/lib/directfb-1.7-7/interfaces/IWater
-#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la
-usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so
-#usr/lib/directfb-1.7-7/systems
-#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so
-#usr/lib/directfb-1.7-7/wm
-#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la
-usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so
-usr/lib/lib++dfb-1.7.so.7
-usr/lib/lib++dfb-1.7.so.7.0.0
-#usr/lib/lib++dfb.la
-#usr/lib/lib++dfb.so
-#usr/lib/libdavinci_c64x.la
-#usr/lib/libdavinci_c64x.so
-usr/lib/libdavinci_c64x.so.0
-usr/lib/libdavinci_c64x.so.0.0.0
-usr/lib/libdirect-1.7.so.7
-usr/lib/libdirect-1.7.so.7.0.0
-#usr/lib/libdirect.la
-usr/lib/libdirect.so
-usr/lib/libdirectfb-1.7.so.7
-usr/lib/libdirectfb-1.7.so.7.0.0
-#usr/lib/libdirectfb.la
-usr/lib/libdirectfb.so
-usr/lib/libfusion-1.7.so.7
-usr/lib/libfusion-1.7.so.7.0.0
-#usr/lib/libfusion.la
-usr/lib/libfusion.so
-#usr/lib/pkgconfig/++dfb.pc
-#usr/lib/pkgconfig/direct.pc
-#usr/lib/pkgconfig/directfb-internal.pc
-#usr/lib/pkgconfig/directfb.pc
-#usr/lib/pkgconfig/fusion.pc
-#usr/share/directfb-1.7.7
-usr/share/directfb-1.7.7/cursor.dat
-usr/share/directfb-1.7.7/cursor.png
-usr/share/directfb-1.7.7/decker.dgiff
-usr/share/directfb-1.7.7/decker.ttf
-#usr/share/man/man1/dfbg.1
-#usr/share/man/man1/directfb-csource.1
-#usr/share/man/man5/directfbrc.5
diff --git a/config/rootfiles/packages/armv7hl/directfb b/config/rootfiles/packages/armv7hl/directfb
deleted file mode 100644
index 9863c68af..000000000
--- a/config/rootfiles/packages/armv7hl/directfb
+++ /dev/null
@@ -1,402 +0,0 @@
-usr/bin/c64xdump
-usr/bin/dfbdump
-usr/bin/dfbdumpinput
-usr/bin/dfbfx
-usr/bin/dfbg
-usr/bin/dfbinfo
-usr/bin/dfbinput
-usr/bin/dfbinspector
-usr/bin/dfblayer
-usr/bin/dfbmaster
-usr/bin/dfbpenmount
-usr/bin/dfbplay
-usr/bin/dfbscreen
-usr/bin/dfbshow
-usr/bin/dfbswitch
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/bin/mkdfiff
-usr/bin/mkdgiff
-usr/bin/mkdgifft
-usr/bin/pxa3xx_dump
-#usr/include/++dfb
-#usr/include/++dfb/++dfb.h
-#usr/include/++dfb/++dfb_mangle.h
-#usr/include/++dfb/++dfb_unmangle.h
-#usr/include/++dfb/idirectfb.h
-#usr/include/++dfb/idirectfbdatabuffer.h
-#usr/include/++dfb/idirectfbdisplaylayer.h
-#usr/include/++dfb/idirectfbeventbuffer.h
-#usr/include/++dfb/idirectfbfont.h
-#usr/include/++dfb/idirectfbimageprovider.h
-#usr/include/++dfb/idirectfbinputdevice.h
-#usr/include/++dfb/idirectfbpalette.h
-#usr/include/++dfb/idirectfbscreen.h
-#usr/include/++dfb/idirectfbsurface.h
-#usr/include/++dfb/idirectfbvideoprovider.h
-#usr/include/++dfb/idirectfbwindow.h
-#usr/include/directfb
-#usr/include/directfb-internal
-#usr/include/directfb-internal/core
-#usr/include/directfb-internal/core/CoreDFB.h
-#usr/include/directfb-internal/core/CoreDFB_CallMode.h
-#usr/include/directfb-internal/core/CoreDFB_includes.h
-#usr/include/directfb-internal/core/CoreGraphicsState.h
-#usr/include/directfb-internal/core/CoreGraphicsStateClient.h
-#usr/include/directfb-internal/core/CoreGraphicsState_includes.h
-#usr/include/directfb-internal/core/CoreInputDevice.h
-#usr/include/directfb-internal/core/CoreInputDevice_includes.h
-#usr/include/directfb-internal/core/CoreLayer.h
-#usr/include/directfb-internal/core/CoreLayerContext.h
-#usr/include/directfb-internal/core/CoreLayerContext_includes.h
-#usr/include/directfb-internal/core/CoreLayerRegion.h
-#usr/include/directfb-internal/core/CoreLayerRegion_includes.h
-#usr/include/directfb-internal/core/CoreLayer_includes.h
-#usr/include/directfb-internal/core/CorePalette.h
-#usr/include/directfb-internal/core/CorePalette_includes.h
-#usr/include/directfb-internal/core/CoreScreen.h
-#usr/include/directfb-internal/core/CoreScreen_includes.h
-#usr/include/directfb-internal/core/CoreSlave.h
-#usr/include/directfb-internal/core/CoreSlave_includes.h
-#usr/include/directfb-internal/core/CoreSurface.h
-#usr/include/directfb-internal/core/CoreSurfaceClient.h
-#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h
-#usr/include/directfb-internal/core/CoreSurface_includes.h
-#usr/include/directfb-internal/core/CoreWindow.h
-#usr/include/directfb-internal/core/CoreWindowStack.h
-#usr/include/directfb-internal/core/CoreWindowStack_includes.h
-#usr/include/directfb-internal/core/CoreWindow_includes.h
-#usr/include/directfb-internal/core/Debug.h
-#usr/include/directfb-internal/core/DisplayTask.h
-#usr/include/directfb-internal/core/Fifo.h
-#usr/include/directfb-internal/core/Interface.h
-#usr/include/directfb-internal/core/PacketBuffer.h
-#usr/include/directfb-internal/core/Renderer.h
-#usr/include/directfb-internal/core/SurfaceTask.h
-#usr/include/directfb-internal/core/Task.h
-#usr/include/directfb-internal/core/TaskManager.h
-#usr/include/directfb-internal/core/TaskThreadsQ.h
-#usr/include/directfb-internal/core/Util.h
-#usr/include/directfb-internal/core/clipboard.h
-#usr/include/directfb-internal/core/colorhash.h
-#usr/include/directfb-internal/core/core.h
-#usr/include/directfb-internal/core/core_parts.h
-#usr/include/directfb-internal/core/core_strings.h
-#usr/include/directfb-internal/core/core_system.h
-#usr/include/directfb-internal/core/coredefs.h
-#usr/include/directfb-internal/core/coretypes.h
-#usr/include/directfb-internal/core/fonts.h
-#usr/include/directfb-internal/core/gfxcard.h
-#usr/include/directfb-internal/core/graphics_driver.h
-#usr/include/directfb-internal/core/graphics_state.h
-#usr/include/directfb-internal/core/input.h
-#usr/include/directfb-internal/core/input_driver.h
-#usr/include/directfb-internal/core/input_hub.h
-#usr/include/directfb-internal/core/layer_context.h
-#usr/include/directfb-internal/core/layer_control.h
-#usr/include/directfb-internal/core/layer_region.h
-#usr/include/directfb-internal/core/layers.h
-#usr/include/directfb-internal/core/layers_internal.h
-#usr/include/directfb-internal/core/palette.h
-#usr/include/directfb-internal/core/screen.h
-#usr/include/directfb-internal/core/screens.h
-#usr/include/directfb-internal/core/screens_internal.h
-#usr/include/directfb-internal/core/state.h
-#usr/include/directfb-internal/core/surface.h
-#usr/include/directfb-internal/core/surface_allocation.h
-#usr/include/directfb-internal/core/surface_buffer.h
-#usr/include/directfb-internal/core/surface_client.h
-#usr/include/directfb-internal/core/surface_core.h
-#usr/include/directfb-internal/core/surface_pool.h
-#usr/include/directfb-internal/core/surface_pool_bridge.h
-#usr/include/directfb-internal/core/system.h
-#usr/include/directfb-internal/core/windows.h
-#usr/include/directfb-internal/core/windows_internal.h
-#usr/include/directfb-internal/core/windowstack.h
-#usr/include/directfb-internal/core/wm.h
-#usr/include/directfb-internal/core/wm_module.h
-#usr/include/directfb-internal/devmem
-#usr/include/directfb-internal/devmem/devmem.h
-#usr/include/directfb-internal/devmem/surfacemanager.h
-#usr/include/directfb-internal/display
-#usr/include/directfb-internal/display/idirectfbdisplaylayer.h
-#usr/include/directfb-internal/display/idirectfbpalette.h
-#usr/include/directfb-internal/display/idirectfbscreen.h
-#usr/include/directfb-internal/display/idirectfbsurface.h
-#usr/include/directfb-internal/display/idirectfbsurface_layer.h
-#usr/include/directfb-internal/display/idirectfbsurface_window.h
-#usr/include/directfb-internal/dummy
-#usr/include/directfb-internal/dummy/dummy.h
-#usr/include/directfb-internal/fbdev
-#usr/include/directfb-internal/fbdev/agp.h
-#usr/include/directfb-internal/fbdev/fb.h
-#usr/include/directfb-internal/fbdev/fbdev.h
-#usr/include/directfb-internal/fbdev/surfacemanager.h
-#usr/include/directfb-internal/fbdev/vt.h
-#usr/include/directfb-internal/gfx
-#usr/include/directfb-internal/gfx/clip.h
-#usr/include/directfb-internal/gfx/convert.h
-#usr/include/directfb-internal/gfx/generic
-#usr/include/directfb-internal/gfx/generic/generic.h
-#usr/include/directfb-internal/gfx/util.h
-#usr/include/directfb-internal/idirectfb.h
-#usr/include/directfb-internal/init.h
-#usr/include/directfb-internal/input
-#usr/include/directfb-internal/input/idirectfbinputbuffer.h
-#usr/include/directfb-internal/input/idirectfbinputdevice.h
-#usr/include/directfb-internal/media
-#usr/include/directfb-internal/media/idirectfbdatabuffer.h
-#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h
-#usr/include/directfb-internal/media/idirectfbfont.h
-#usr/include/directfb-internal/media/idirectfbimageprovider.h
-#usr/include/directfb-internal/media/idirectfbimageprovider_client.h
-#usr/include/directfb-internal/media/idirectfbvideoprovider.h
-#usr/include/directfb-internal/misc
-#usr/include/directfb-internal/misc/conf.h
-#usr/include/directfb-internal/misc/gfx_util.h
-#usr/include/directfb-internal/misc/util.h
-#usr/include/directfb-internal/windows
-#usr/include/directfb-internal/windows/idirectfbwindow.h
-#usr/include/directfb/dfb_types.h
-#usr/include/directfb/dfiff.h
-#usr/include/directfb/dgiff.h
-#usr/include/directfb/direct
-#usr/include/directfb/direct/Lists.h
-#usr/include/directfb/direct/LockWQ.h
-#usr/include/directfb/direct/Magic.h
-#usr/include/directfb/direct/Mutex.h
-#usr/include/directfb/direct/Performer.h
-#usr/include/directfb/direct/String.h
-#usr/include/directfb/direct/TLSObject.h
-#usr/include/directfb/direct/ToString.h
-#usr/include/directfb/direct/Types++.h
-#usr/include/directfb/direct/atomic.h
-#usr/include/directfb/direct/build.h
-#usr/include/directfb/direct/clock.h
-#usr/include/directfb/direct/compiler.h
-#usr/include/directfb/direct/conf.h
-#usr/include/directfb/direct/debug.h
-#usr/include/directfb/direct/direct.h
-#usr/include/directfb/direct/fastlz.h
-#usr/include/directfb/direct/fifo.h
-#usr/include/directfb/direct/filesystem.h
-#usr/include/directfb/direct/flz.h
-#usr/include/directfb/direct/hash.h
-#usr/include/directfb/direct/init.h
-#usr/include/directfb/direct/interface.h
-#usr/include/directfb/direct/interface_implementation.h
-#usr/include/directfb/direct/list.h
-#usr/include/directfb/direct/log.h
-#usr/include/directfb/direct/log_domain.h
-#usr/include/directfb/direct/map.h
-#usr/include/directfb/direct/mem.h
-#usr/include/directfb/direct/memcpy.h
-#usr/include/directfb/direct/messages.h
-#usr/include/directfb/direct/modules.h
-#usr/include/directfb/direct/os
-#usr/include/directfb/direct/os/clock.h
-#usr/include/directfb/direct/os/filesystem.h
-#usr/include/directfb/direct/os/linux
-#usr/include/directfb/direct/os/linux/glibc
-#usr/include/directfb/direct/os/linux/glibc/filesystem.h
-#usr/include/directfb/direct/os/linux/glibc/mutex.h
-#usr/include/directfb/direct/os/linux/glibc/thread.h
-#usr/include/directfb/direct/os/linux/glibc/types.h
-#usr/include/directfb/direct/os/linux/glibc/waitqueue.h
-#usr/include/directfb/direct/os/log.h
-#usr/include/directfb/direct/os/mem.h
-#usr/include/directfb/direct/os/mutex.h
-#usr/include/directfb/direct/os/signals.h
-#usr/include/directfb/direct/os/system.h
-#usr/include/directfb/direct/os/thread.h
-#usr/include/directfb/direct/os/types.h
-#usr/include/directfb/direct/os/waitqueue.h
-#usr/include/directfb/direct/perf.h
-#usr/include/directfb/direct/print.h
-#usr/include/directfb/direct/processor.h
-#usr/include/directfb/direct/result.h
-#usr/include/directfb/direct/serial.h
-#usr/include/directfb/direct/signals.h
-#usr/include/directfb/direct/stream.h
-#usr/include/directfb/direct/system.h
-#usr/include/directfb/direct/thread.h
-#usr/include/directfb/direct/trace.h
-#usr/include/directfb/direct/tree.h
-#usr/include/directfb/direct/types.h
-#usr/include/directfb/direct/utf8.h
-#usr/include/directfb/direct/util.h
-#usr/include/directfb/direct/uuid.h
-#usr/include/directfb/directfb++.h
-#usr/include/directfb/directfb.h
-#usr/include/directfb/directfb_build.h
-#usr/include/directfb/directfb_graphics.h
-#usr/include/directfb/directfb_keyboard.h
-#usr/include/directfb/directfb_keynames.h
-#usr/include/directfb/directfb_strings.h
-#usr/include/directfb/directfb_util.h
-#usr/include/directfb/directfb_version.h
-#usr/include/directfb/directfb_water.h
-#usr/include/directfb/directfb_water_strings.h
-#usr/include/directfb/directfb_windows.h
-#usr/include/directfb/directfbgl.h
-#usr/include/directfb/directfbgl2.h
-#usr/include/directfb/fusion
-#usr/include/directfb/fusion/Debug.h
-#usr/include/directfb/fusion/arena.h
-#usr/include/directfb/fusion/build.h
-#usr/include/directfb/fusion/call.h
-#usr/include/directfb/fusion/conf.h
-#usr/include/directfb/fusion/fusion.h
-#usr/include/directfb/fusion/fusion_internal.h
-#usr/include/directfb/fusion/hash.h
-#usr/include/directfb/fusion/init.h
-#usr/include/directfb/fusion/lock.h
-#usr/include/directfb/fusion/object.h
-#usr/include/directfb/fusion/property.h
-#usr/include/directfb/fusion/protocol.h
-#usr/include/directfb/fusion/reactor.h
-#usr/include/directfb/fusion/ref.h
-#usr/include/directfb/fusion/shm
-#usr/include/directfb/fusion/shm/pool.h
-#usr/include/directfb/fusion/shm/shm.h
-#usr/include/directfb/fusion/shm/shm_internal.h
-#usr/include/directfb/fusion/shmalloc.h
-#usr/include/directfb/fusion/types.h
-#usr/include/directfb/fusion/vector.h
-#usr/lib/directfb-1.7-7
-#usr/lib/directfb-1.7-7/gfxdrivers
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_davinci.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_omap.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so
-#usr/lib/directfb-1.7-7/inputdrivers
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ucb1x00_ts.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so
-#usr/lib/directfb-1.7-7/interfaces
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la
-usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so
-#usr/lib/directfb-1.7-7/interfaces/IWater
-#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la
-usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so
-#usr/lib/directfb-1.7-7/systems
-#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so
-#usr/lib/directfb-1.7-7/wm
-#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la
-usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so
-usr/lib/lib++dfb-1.7.so.7
-usr/lib/lib++dfb-1.7.so.7.0.0
-#usr/lib/lib++dfb.la
-#usr/lib/lib++dfb.so
-#usr/lib/libdavinci_c64x.la
-#usr/lib/libdavinci_c64x.so
-usr/lib/libdavinci_c64x.so.0
-usr/lib/libdavinci_c64x.so.0.0.0
-usr/lib/libdirect-1.7.so.7
-usr/lib/libdirect-1.7.so.7.0.0
-#usr/lib/libdirect.la
-#usr/lib/libdirect.so
-usr/lib/libdirectfb-1.7.so.7
-usr/lib/libdirectfb-1.7.so.7.0.0
-#usr/lib/libdirectfb.la
-#usr/lib/libdirectfb.so
-usr/lib/libfusion-1.7.so.7
-usr/lib/libfusion-1.7.so.7.0.0
-#usr/lib/libfusion.la
-#usr/lib/libfusion.so
-#usr/lib/pkgconfig/++dfb.pc
-#usr/lib/pkgconfig/direct.pc
-#usr/lib/pkgconfig/directfb-internal.pc
-#usr/lib/pkgconfig/directfb.pc
-#usr/lib/pkgconfig/fusion.pc
-#usr/share/directfb-1.7.7
-usr/share/directfb-1.7.7/cursor.dat
-usr/share/directfb-1.7.7/cursor.png
-usr/share/directfb-1.7.7/decker.dgiff
-usr/share/directfb-1.7.7/decker.ttf
-#usr/share/man/man1/dfbg.1
-#usr/share/man/man1/directfb-csource.1
-#usr/share/man/man5/directfbrc.5
diff --git a/config/rootfiles/packages/i586/directfb b/config/rootfiles/packages/i586/directfb
deleted file mode 100644
index 9e61f8bf8..000000000
--- a/config/rootfiles/packages/i586/directfb
+++ /dev/null
@@ -1,397 +0,0 @@
-usr/bin/dfbdump
-usr/bin/dfbdumpinput
-usr/bin/dfbfx
-usr/bin/dfbg
-usr/bin/dfbinfo
-usr/bin/dfbinput
-usr/bin/dfbinspector
-usr/bin/dfblayer
-usr/bin/dfbmaster
-usr/bin/dfbpenmount
-usr/bin/dfbplay
-usr/bin/dfbscreen
-usr/bin/dfbshow
-usr/bin/dfbswitch
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/bin/mkdfiff
-usr/bin/mkdgiff
-usr/bin/mkdgifft
-usr/bin/pxa3xx_dump
-#usr/include/++dfb
-#usr/include/++dfb/++dfb.h
-#usr/include/++dfb/++dfb_mangle.h
-#usr/include/++dfb/++dfb_unmangle.h
-#usr/include/++dfb/idirectfb.h
-#usr/include/++dfb/idirectfbdatabuffer.h
-#usr/include/++dfb/idirectfbdisplaylayer.h
-#usr/include/++dfb/idirectfbeventbuffer.h
-#usr/include/++dfb/idirectfbfont.h
-#usr/include/++dfb/idirectfbimageprovider.h
-#usr/include/++dfb/idirectfbinputdevice.h
-#usr/include/++dfb/idirectfbpalette.h
-#usr/include/++dfb/idirectfbscreen.h
-#usr/include/++dfb/idirectfbsurface.h
-#usr/include/++dfb/idirectfbvideoprovider.h
-#usr/include/++dfb/idirectfbwindow.h
-#usr/include/directfb
-#usr/include/directfb-internal
-#usr/include/directfb-internal/core
-#usr/include/directfb-internal/core/CoreDFB.h
-#usr/include/directfb-internal/core/CoreDFB_CallMode.h
-#usr/include/directfb-internal/core/CoreDFB_includes.h
-#usr/include/directfb-internal/core/CoreGraphicsState.h
-#usr/include/directfb-internal/core/CoreGraphicsStateClient.h
-#usr/include/directfb-internal/core/CoreGraphicsState_includes.h
-#usr/include/directfb-internal/core/CoreInputDevice.h
-#usr/include/directfb-internal/core/CoreInputDevice_includes.h
-#usr/include/directfb-internal/core/CoreLayer.h
-#usr/include/directfb-internal/core/CoreLayerContext.h
-#usr/include/directfb-internal/core/CoreLayerContext_includes.h
-#usr/include/directfb-internal/core/CoreLayerRegion.h
-#usr/include/directfb-internal/core/CoreLayerRegion_includes.h
-#usr/include/directfb-internal/core/CoreLayer_includes.h
-#usr/include/directfb-internal/core/CorePalette.h
-#usr/include/directfb-internal/core/CorePalette_includes.h
-#usr/include/directfb-internal/core/CoreScreen.h
-#usr/include/directfb-internal/core/CoreScreen_includes.h
-#usr/include/directfb-internal/core/CoreSlave.h
-#usr/include/directfb-internal/core/CoreSlave_includes.h
-#usr/include/directfb-internal/core/CoreSurface.h
-#usr/include/directfb-internal/core/CoreSurfaceClient.h
-#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h
-#usr/include/directfb-internal/core/CoreSurface_includes.h
-#usr/include/directfb-internal/core/CoreWindow.h
-#usr/include/directfb-internal/core/CoreWindowStack.h
-#usr/include/directfb-internal/core/CoreWindowStack_includes.h
-#usr/include/directfb-internal/core/CoreWindow_includes.h
-#usr/include/directfb-internal/core/Debug.h
-#usr/include/directfb-internal/core/DisplayTask.h
-#usr/include/directfb-internal/core/Fifo.h
-#usr/include/directfb-internal/core/Interface.h
-#usr/include/directfb-internal/core/PacketBuffer.h
-#usr/include/directfb-internal/core/Renderer.h
-#usr/include/directfb-internal/core/SurfaceTask.h
-#usr/include/directfb-internal/core/Task.h
-#usr/include/directfb-internal/core/TaskManager.h
-#usr/include/directfb-internal/core/TaskThreadsQ.h
-#usr/include/directfb-internal/core/Util.h
-#usr/include/directfb-internal/core/clipboard.h
-#usr/include/directfb-internal/core/colorhash.h
-#usr/include/directfb-internal/core/core.h
-#usr/include/directfb-internal/core/core_parts.h
-#usr/include/directfb-internal/core/core_strings.h
-#usr/include/directfb-internal/core/core_system.h
-#usr/include/directfb-internal/core/coredefs.h
-#usr/include/directfb-internal/core/coretypes.h
-#usr/include/directfb-internal/core/fonts.h
-#usr/include/directfb-internal/core/gfxcard.h
-#usr/include/directfb-internal/core/graphics_driver.h
-#usr/include/directfb-internal/core/graphics_state.h
-#usr/include/directfb-internal/core/input.h
-#usr/include/directfb-internal/core/input_driver.h
-#usr/include/directfb-internal/core/input_hub.h
-#usr/include/directfb-internal/core/layer_context.h
-#usr/include/directfb-internal/core/layer_control.h
-#usr/include/directfb-internal/core/layer_region.h
-#usr/include/directfb-internal/core/layers.h
-#usr/include/directfb-internal/core/layers_internal.h
-#usr/include/directfb-internal/core/palette.h
-#usr/include/directfb-internal/core/screen.h
-#usr/include/directfb-internal/core/screens.h
-#usr/include/directfb-internal/core/screens_internal.h
-#usr/include/directfb-internal/core/state.h
-#usr/include/directfb-internal/core/surface.h
-#usr/include/directfb-internal/core/surface_allocation.h
-#usr/include/directfb-internal/core/surface_buffer.h
-#usr/include/directfb-internal/core/surface_client.h
-#usr/include/directfb-internal/core/surface_core.h
-#usr/include/directfb-internal/core/surface_pool.h
-#usr/include/directfb-internal/core/surface_pool_bridge.h
-#usr/include/directfb-internal/core/system.h
-#usr/include/directfb-internal/core/windows.h
-#usr/include/directfb-internal/core/windows_internal.h
-#usr/include/directfb-internal/core/windowstack.h
-#usr/include/directfb-internal/core/wm.h
-#usr/include/directfb-internal/core/wm_module.h
-#usr/include/directfb-internal/devmem
-#usr/include/directfb-internal/devmem/devmem.h
-#usr/include/directfb-internal/devmem/surfacemanager.h
-#usr/include/directfb-internal/display
-#usr/include/directfb-internal/display/idirectfbdisplaylayer.h
-#usr/include/directfb-internal/display/idirectfbpalette.h
-#usr/include/directfb-internal/display/idirectfbscreen.h
-#usr/include/directfb-internal/display/idirectfbsurface.h
-#usr/include/directfb-internal/display/idirectfbsurface_layer.h
-#usr/include/directfb-internal/display/idirectfbsurface_window.h
-#usr/include/directfb-internal/dummy
-#usr/include/directfb-internal/dummy/dummy.h
-#usr/include/directfb-internal/fbdev
-#usr/include/directfb-internal/fbdev/agp.h
-#usr/include/directfb-internal/fbdev/fb.h
-#usr/include/directfb-internal/fbdev/fbdev.h
-#usr/include/directfb-internal/fbdev/surfacemanager.h
-#usr/include/directfb-internal/fbdev/vt.h
-#usr/include/directfb-internal/gfx
-#usr/include/directfb-internal/gfx/clip.h
-#usr/include/directfb-internal/gfx/convert.h
-#usr/include/directfb-internal/gfx/generic
-#usr/include/directfb-internal/gfx/generic/generic.h
-#usr/include/directfb-internal/gfx/util.h
-#usr/include/directfb-internal/idirectfb.h
-#usr/include/directfb-internal/init.h
-#usr/include/directfb-internal/input
-#usr/include/directfb-internal/input/idirectfbinputbuffer.h
-#usr/include/directfb-internal/input/idirectfbinputdevice.h
-#usr/include/directfb-internal/media
-#usr/include/directfb-internal/media/idirectfbdatabuffer.h
-#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h
-#usr/include/directfb-internal/media/idirectfbfont.h
-#usr/include/directfb-internal/media/idirectfbimageprovider.h
-#usr/include/directfb-internal/media/idirectfbimageprovider_client.h
-#usr/include/directfb-internal/media/idirectfbvideoprovider.h
-#usr/include/directfb-internal/misc
-#usr/include/directfb-internal/misc/conf.h
-#usr/include/directfb-internal/misc/gfx_util.h
-#usr/include/directfb-internal/misc/util.h
-#usr/include/directfb-internal/windows
-#usr/include/directfb-internal/windows/idirectfbwindow.h
-#usr/include/directfb/dfb_types.h
-#usr/include/directfb/dfiff.h
-#usr/include/directfb/dgiff.h
-#usr/include/directfb/direct
-#usr/include/directfb/direct/Lists.h
-#usr/include/directfb/direct/LockWQ.h
-#usr/include/directfb/direct/Magic.h
-#usr/include/directfb/direct/Mutex.h
-#usr/include/directfb/direct/Performer.h
-#usr/include/directfb/direct/String.h
-#usr/include/directfb/direct/TLSObject.h
-#usr/include/directfb/direct/ToString.h
-#usr/include/directfb/direct/Types++.h
-#usr/include/directfb/direct/atomic.h
-#usr/include/directfb/direct/build.h
-#usr/include/directfb/direct/clock.h
-#usr/include/directfb/direct/compiler.h
-#usr/include/directfb/direct/conf.h
-#usr/include/directfb/direct/debug.h
-#usr/include/directfb/direct/direct.h
-#usr/include/directfb/direct/fastlz.h
-#usr/include/directfb/direct/fifo.h
-#usr/include/directfb/direct/filesystem.h
-#usr/include/directfb/direct/flz.h
-#usr/include/directfb/direct/hash.h
-#usr/include/directfb/direct/init.h
-#usr/include/directfb/direct/interface.h
-#usr/include/directfb/direct/interface_implementation.h
-#usr/include/directfb/direct/list.h
-#usr/include/directfb/direct/log.h
-#usr/include/directfb/direct/log_domain.h
-#usr/include/directfb/direct/map.h
-#usr/include/directfb/direct/mem.h
-#usr/include/directfb/direct/memcpy.h
-#usr/include/directfb/direct/messages.h
-#usr/include/directfb/direct/modules.h
-#usr/include/directfb/direct/os
-#usr/include/directfb/direct/os/clock.h
-#usr/include/directfb/direct/os/filesystem.h
-#usr/include/directfb/direct/os/linux
-#usr/include/directfb/direct/os/linux/glibc
-#usr/include/directfb/direct/os/linux/glibc/filesystem.h
-#usr/include/directfb/direct/os/linux/glibc/mutex.h
-#usr/include/directfb/direct/os/linux/glibc/thread.h
-#usr/include/directfb/direct/os/linux/glibc/types.h
-#usr/include/directfb/direct/os/linux/glibc/waitqueue.h
-#usr/include/directfb/direct/os/log.h
-#usr/include/directfb/direct/os/mem.h
-#usr/include/directfb/direct/os/mutex.h
-#usr/include/directfb/direct/os/signals.h
-#usr/include/directfb/direct/os/system.h
-#usr/include/directfb/direct/os/thread.h
-#usr/include/directfb/direct/os/types.h
-#usr/include/directfb/direct/os/waitqueue.h
-#usr/include/directfb/direct/perf.h
-#usr/include/directfb/direct/print.h
-#usr/include/directfb/direct/processor.h
-#usr/include/directfb/direct/result.h
-#usr/include/directfb/direct/serial.h
-#usr/include/directfb/direct/signals.h
-#usr/include/directfb/direct/stream.h
-#usr/include/directfb/direct/system.h
-#usr/include/directfb/direct/thread.h
-#usr/include/directfb/direct/trace.h
-#usr/include/directfb/direct/tree.h
-#usr/include/directfb/direct/types.h
-#usr/include/directfb/direct/utf8.h
-#usr/include/directfb/direct/util.h
-#usr/include/directfb/direct/uuid.h
-#usr/include/directfb/directfb++.h
-#usr/include/directfb/directfb.h
-#usr/include/directfb/directfb_build.h
-#usr/include/directfb/directfb_graphics.h
-#usr/include/directfb/directfb_keyboard.h
-#usr/include/directfb/directfb_keynames.h
-#usr/include/directfb/directfb_strings.h
-#usr/include/directfb/directfb_util.h
-#usr/include/directfb/directfb_version.h
-#usr/include/directfb/directfb_water.h
-#usr/include/directfb/directfb_water_strings.h
-#usr/include/directfb/directfb_windows.h
-#usr/include/directfb/directfbgl.h
-#usr/include/directfb/directfbgl2.h
-#usr/include/directfb/fusion
-#usr/include/directfb/fusion/Debug.h
-#usr/include/directfb/fusion/arena.h
-#usr/include/directfb/fusion/build.h
-#usr/include/directfb/fusion/call.h
-#usr/include/directfb/fusion/conf.h
-#usr/include/directfb/fusion/fusion.h
-#usr/include/directfb/fusion/fusion_internal.h
-#usr/include/directfb/fusion/hash.h
-#usr/include/directfb/fusion/init.h
-#usr/include/directfb/fusion/lock.h
-#usr/include/directfb/fusion/object.h
-#usr/include/directfb/fusion/property.h
-#usr/include/directfb/fusion/protocol.h
-#usr/include/directfb/fusion/reactor.h
-#usr/include/directfb/fusion/ref.h
-#usr/include/directfb/fusion/shm
-#usr/include/directfb/fusion/shm/pool.h
-#usr/include/directfb/fusion/shm/shm.h
-#usr/include/directfb/fusion/shm/shm_internal.h
-#usr/include/directfb/fusion/shmalloc.h
-#usr/include/directfb/fusion/types.h
-#usr/include/directfb/fusion/vector.h
-#usr/lib/directfb-1.7-7
-#usr/lib/directfb-1.7-7/gfxdrivers
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so
-#usr/lib/directfb-1.7-7/inputdrivers
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so
-#usr/lib/directfb-1.7-7/interfaces
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la
-usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so
-#usr/lib/directfb-1.7-7/interfaces/IWater
-#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la
-usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so
-#usr/lib/directfb-1.7-7/systems
-#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so
-#usr/lib/directfb-1.7-7/wm
-#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la
-usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so
-usr/lib/lib++dfb-1.7.so.7
-usr/lib/lib++dfb-1.7.so.7.0.0
-#usr/lib/lib++dfb.la
-#usr/lib/lib++dfb.so
-usr/lib/libdirect-1.7.so.7
-usr/lib/libdirect-1.7.so.7.0.0
-#usr/lib/libdirect.la
-#usr/lib/libdirect.so
-usr/lib/libdirectfb-1.7.so.7
-usr/lib/libdirectfb-1.7.so.7.0.0
-#usr/lib/libdirectfb.la
-usr/lib/libdirectfb.so
-usr/lib/libfusion-1.7.so.7
-usr/lib/libfusion-1.7.so.7.0.0
-#usr/lib/libfusion.la
-#usr/lib/libfusion.so
-#usr/lib/pkgconfig/++dfb.pc
-#usr/lib/pkgconfig/direct.pc
-#usr/lib/pkgconfig/directfb-internal.pc
-#usr/lib/pkgconfig/directfb.pc
-#usr/lib/pkgconfig/fusion.pc
-#usr/share/directfb-1.7.7
-usr/share/directfb-1.7.7/cursor.dat
-usr/share/directfb-1.7.7/cursor.png
-usr/share/directfb-1.7.7/decker.dgiff
-usr/share/directfb-1.7.7/decker.ttf
-#usr/share/man/man1/dfbg.1
-#usr/share/man/man1/directfb-csource.1
-#usr/share/man/man5/directfbrc.5
diff --git a/config/rootfiles/packages/x86_64/directfb b/config/rootfiles/packages/x86_64/directfb
deleted file mode 100644
index dc291bf12..000000000
--- a/config/rootfiles/packages/x86_64/directfb
+++ /dev/null
@@ -1,397 +0,0 @@
-usr/bin/dfbdump
-usr/bin/dfbdumpinput
-usr/bin/dfbfx
-usr/bin/dfbg
-usr/bin/dfbinfo
-usr/bin/dfbinput
-usr/bin/dfbinspector
-usr/bin/dfblayer
-usr/bin/dfbmaster
-usr/bin/dfbpenmount
-usr/bin/dfbplay
-usr/bin/dfbscreen
-usr/bin/dfbshow
-usr/bin/dfbswitch
-usr/bin/directfb-config
-usr/bin/directfb-csource
-usr/bin/mkdfiff
-usr/bin/mkdgiff
-usr/bin/mkdgifft
-usr/bin/pxa3xx_dump
-#usr/include/++dfb
-#usr/include/++dfb/++dfb.h
-#usr/include/++dfb/++dfb_mangle.h
-#usr/include/++dfb/++dfb_unmangle.h
-#usr/include/++dfb/idirectfb.h
-#usr/include/++dfb/idirectfbdatabuffer.h
-#usr/include/++dfb/idirectfbdisplaylayer.h
-#usr/include/++dfb/idirectfbeventbuffer.h
-#usr/include/++dfb/idirectfbfont.h
-#usr/include/++dfb/idirectfbimageprovider.h
-#usr/include/++dfb/idirectfbinputdevice.h
-#usr/include/++dfb/idirectfbpalette.h
-#usr/include/++dfb/idirectfbscreen.h
-#usr/include/++dfb/idirectfbsurface.h
-#usr/include/++dfb/idirectfbvideoprovider.h
-#usr/include/++dfb/idirectfbwindow.h
-#usr/include/directfb
-#usr/include/directfb-internal
-#usr/include/directfb-internal/core
-#usr/include/directfb-internal/core/CoreDFB.h
-#usr/include/directfb-internal/core/CoreDFB_CallMode.h
-#usr/include/directfb-internal/core/CoreDFB_includes.h
-#usr/include/directfb-internal/core/CoreGraphicsState.h
-#usr/include/directfb-internal/core/CoreGraphicsStateClient.h
-#usr/include/directfb-internal/core/CoreGraphicsState_includes.h
-#usr/include/directfb-internal/core/CoreInputDevice.h
-#usr/include/directfb-internal/core/CoreInputDevice_includes.h
-#usr/include/directfb-internal/core/CoreLayer.h
-#usr/include/directfb-internal/core/CoreLayerContext.h
-#usr/include/directfb-internal/core/CoreLayerContext_includes.h
-#usr/include/directfb-internal/core/CoreLayerRegion.h
-#usr/include/directfb-internal/core/CoreLayerRegion_includes.h
-#usr/include/directfb-internal/core/CoreLayer_includes.h
-#usr/include/directfb-internal/core/CorePalette.h
-#usr/include/directfb-internal/core/CorePalette_includes.h
-#usr/include/directfb-internal/core/CoreScreen.h
-#usr/include/directfb-internal/core/CoreScreen_includes.h
-#usr/include/directfb-internal/core/CoreSlave.h
-#usr/include/directfb-internal/core/CoreSlave_includes.h
-#usr/include/directfb-internal/core/CoreSurface.h
-#usr/include/directfb-internal/core/CoreSurfaceClient.h
-#usr/include/directfb-internal/core/CoreSurfaceClient_includes.h
-#usr/include/directfb-internal/core/CoreSurface_includes.h
-#usr/include/directfb-internal/core/CoreWindow.h
-#usr/include/directfb-internal/core/CoreWindowStack.h
-#usr/include/directfb-internal/core/CoreWindowStack_includes.h
-#usr/include/directfb-internal/core/CoreWindow_includes.h
-#usr/include/directfb-internal/core/Debug.h
-#usr/include/directfb-internal/core/DisplayTask.h
-#usr/include/directfb-internal/core/Fifo.h
-#usr/include/directfb-internal/core/Interface.h
-#usr/include/directfb-internal/core/PacketBuffer.h
-#usr/include/directfb-internal/core/Renderer.h
-#usr/include/directfb-internal/core/SurfaceTask.h
-#usr/include/directfb-internal/core/Task.h
-#usr/include/directfb-internal/core/TaskManager.h
-#usr/include/directfb-internal/core/TaskThreadsQ.h
-#usr/include/directfb-internal/core/Util.h
-#usr/include/directfb-internal/core/clipboard.h
-#usr/include/directfb-internal/core/colorhash.h
-#usr/include/directfb-internal/core/core.h
-#usr/include/directfb-internal/core/core_parts.h
-#usr/include/directfb-internal/core/core_strings.h
-#usr/include/directfb-internal/core/core_system.h
-#usr/include/directfb-internal/core/coredefs.h
-#usr/include/directfb-internal/core/coretypes.h
-#usr/include/directfb-internal/core/fonts.h
-#usr/include/directfb-internal/core/gfxcard.h
-#usr/include/directfb-internal/core/graphics_driver.h
-#usr/include/directfb-internal/core/graphics_state.h
-#usr/include/directfb-internal/core/input.h
-#usr/include/directfb-internal/core/input_driver.h
-#usr/include/directfb-internal/core/input_hub.h
-#usr/include/directfb-internal/core/layer_context.h
-#usr/include/directfb-internal/core/layer_control.h
-#usr/include/directfb-internal/core/layer_region.h
-#usr/include/directfb-internal/core/layers.h
-#usr/include/directfb-internal/core/layers_internal.h
-#usr/include/directfb-internal/core/palette.h
-#usr/include/directfb-internal/core/screen.h
-#usr/include/directfb-internal/core/screens.h
-#usr/include/directfb-internal/core/screens_internal.h
-#usr/include/directfb-internal/core/state.h
-#usr/include/directfb-internal/core/surface.h
-#usr/include/directfb-internal/core/surface_allocation.h
-#usr/include/directfb-internal/core/surface_buffer.h
-#usr/include/directfb-internal/core/surface_client.h
-#usr/include/directfb-internal/core/surface_core.h
-#usr/include/directfb-internal/core/surface_pool.h
-#usr/include/directfb-internal/core/surface_pool_bridge.h
-#usr/include/directfb-internal/core/system.h
-#usr/include/directfb-internal/core/windows.h
-#usr/include/directfb-internal/core/windows_internal.h
-#usr/include/directfb-internal/core/windowstack.h
-#usr/include/directfb-internal/core/wm.h
-#usr/include/directfb-internal/core/wm_module.h
-#usr/include/directfb-internal/devmem
-#usr/include/directfb-internal/devmem/devmem.h
-#usr/include/directfb-internal/devmem/surfacemanager.h
-#usr/include/directfb-internal/display
-#usr/include/directfb-internal/display/idirectfbdisplaylayer.h
-#usr/include/directfb-internal/display/idirectfbpalette.h
-#usr/include/directfb-internal/display/idirectfbscreen.h
-#usr/include/directfb-internal/display/idirectfbsurface.h
-#usr/include/directfb-internal/display/idirectfbsurface_layer.h
-#usr/include/directfb-internal/display/idirectfbsurface_window.h
-#usr/include/directfb-internal/dummy
-#usr/include/directfb-internal/dummy/dummy.h
-#usr/include/directfb-internal/fbdev
-#usr/include/directfb-internal/fbdev/agp.h
-#usr/include/directfb-internal/fbdev/fb.h
-#usr/include/directfb-internal/fbdev/fbdev.h
-#usr/include/directfb-internal/fbdev/surfacemanager.h
-#usr/include/directfb-internal/fbdev/vt.h
-#usr/include/directfb-internal/gfx
-#usr/include/directfb-internal/gfx/clip.h
-#usr/include/directfb-internal/gfx/convert.h
-#usr/include/directfb-internal/gfx/generic
-#usr/include/directfb-internal/gfx/generic/generic.h
-#usr/include/directfb-internal/gfx/util.h
-#usr/include/directfb-internal/idirectfb.h
-#usr/include/directfb-internal/init.h
-#usr/include/directfb-internal/input
-#usr/include/directfb-internal/input/idirectfbinputbuffer.h
-#usr/include/directfb-internal/input/idirectfbinputdevice.h
-#usr/include/directfb-internal/media
-#usr/include/directfb-internal/media/idirectfbdatabuffer.h
-#usr/include/directfb-internal/media/idirectfbdatabuffer_client.h
-#usr/include/directfb-internal/media/idirectfbfont.h
-#usr/include/directfb-internal/media/idirectfbimageprovider.h
-#usr/include/directfb-internal/media/idirectfbimageprovider_client.h
-#usr/include/directfb-internal/media/idirectfbvideoprovider.h
-#usr/include/directfb-internal/misc
-#usr/include/directfb-internal/misc/conf.h
-#usr/include/directfb-internal/misc/gfx_util.h
-#usr/include/directfb-internal/misc/util.h
-#usr/include/directfb-internal/windows
-#usr/include/directfb-internal/windows/idirectfbwindow.h
-#usr/include/directfb/dfb_types.h
-#usr/include/directfb/dfiff.h
-#usr/include/directfb/dgiff.h
-#usr/include/directfb/direct
-#usr/include/directfb/direct/Lists.h
-#usr/include/directfb/direct/LockWQ.h
-#usr/include/directfb/direct/Magic.h
-#usr/include/directfb/direct/Mutex.h
-#usr/include/directfb/direct/Performer.h
-#usr/include/directfb/direct/String.h
-#usr/include/directfb/direct/TLSObject.h
-#usr/include/directfb/direct/ToString.h
-#usr/include/directfb/direct/Types++.h
-#usr/include/directfb/direct/atomic.h
-#usr/include/directfb/direct/build.h
-#usr/include/directfb/direct/clock.h
-#usr/include/directfb/direct/compiler.h
-#usr/include/directfb/direct/conf.h
-#usr/include/directfb/direct/debug.h
-#usr/include/directfb/direct/direct.h
-#usr/include/directfb/direct/fastlz.h
-#usr/include/directfb/direct/fifo.h
-#usr/include/directfb/direct/filesystem.h
-#usr/include/directfb/direct/flz.h
-#usr/include/directfb/direct/hash.h
-#usr/include/directfb/direct/init.h
-#usr/include/directfb/direct/interface.h
-#usr/include/directfb/direct/interface_implementation.h
-#usr/include/directfb/direct/list.h
-#usr/include/directfb/direct/log.h
-#usr/include/directfb/direct/log_domain.h
-#usr/include/directfb/direct/map.h
-#usr/include/directfb/direct/mem.h
-#usr/include/directfb/direct/memcpy.h
-#usr/include/directfb/direct/messages.h
-#usr/include/directfb/direct/modules.h
-#usr/include/directfb/direct/os
-#usr/include/directfb/direct/os/clock.h
-#usr/include/directfb/direct/os/filesystem.h
-#usr/include/directfb/direct/os/linux
-#usr/include/directfb/direct/os/linux/glibc
-#usr/include/directfb/direct/os/linux/glibc/filesystem.h
-#usr/include/directfb/direct/os/linux/glibc/mutex.h
-#usr/include/directfb/direct/os/linux/glibc/thread.h
-#usr/include/directfb/direct/os/linux/glibc/types.h
-#usr/include/directfb/direct/os/linux/glibc/waitqueue.h
-#usr/include/directfb/direct/os/log.h
-#usr/include/directfb/direct/os/mem.h
-#usr/include/directfb/direct/os/mutex.h
-#usr/include/directfb/direct/os/signals.h
-#usr/include/directfb/direct/os/system.h
-#usr/include/directfb/direct/os/thread.h
-#usr/include/directfb/direct/os/types.h
-#usr/include/directfb/direct/os/waitqueue.h
-#usr/include/directfb/direct/perf.h
-#usr/include/directfb/direct/print.h
-#usr/include/directfb/direct/processor.h
-#usr/include/directfb/direct/result.h
-#usr/include/directfb/direct/serial.h
-#usr/include/directfb/direct/signals.h
-#usr/include/directfb/direct/stream.h
-#usr/include/directfb/direct/system.h
-#usr/include/directfb/direct/thread.h
-#usr/include/directfb/direct/trace.h
-#usr/include/directfb/direct/tree.h
-#usr/include/directfb/direct/types.h
-#usr/include/directfb/direct/utf8.h
-#usr/include/directfb/direct/util.h
-#usr/include/directfb/direct/uuid.h
-#usr/include/directfb/directfb++.h
-#usr/include/directfb/directfb.h
-#usr/include/directfb/directfb_build.h
-#usr/include/directfb/directfb_graphics.h
-#usr/include/directfb/directfb_keyboard.h
-#usr/include/directfb/directfb_keynames.h
-#usr/include/directfb/directfb_strings.h
-#usr/include/directfb/directfb_util.h
-#usr/include/directfb/directfb_version.h
-#usr/include/directfb/directfb_water.h
-#usr/include/directfb/directfb_water_strings.h
-#usr/include/directfb/directfb_windows.h
-#usr/include/directfb/directfbgl.h
-#usr/include/directfb/directfbgl2.h
-#usr/include/directfb/fusion
-#usr/include/directfb/fusion/Debug.h
-#usr/include/directfb/fusion/arena.h
-#usr/include/directfb/fusion/build.h
-#usr/include/directfb/fusion/call.h
-#usr/include/directfb/fusion/conf.h
-#usr/include/directfb/fusion/fusion.h
-#usr/include/directfb/fusion/fusion_internal.h
-#usr/include/directfb/fusion/hash.h
-#usr/include/directfb/fusion/init.h
-#usr/include/directfb/fusion/lock.h
-#usr/include/directfb/fusion/object.h
-#usr/include/directfb/fusion/property.h
-#usr/include/directfb/fusion/protocol.h
-#usr/include/directfb/fusion/reactor.h
-#usr/include/directfb/fusion/ref.h
-#usr/include/directfb/fusion/shm
-#usr/include/directfb/fusion/shm/pool.h
-#usr/include/directfb/fusion/shm/shm.h
-#usr/include/directfb/fusion/shm/shm_internal.h
-#usr/include/directfb/fusion/shmalloc.h
-#usr/include/directfb/fusion/types.h
-#usr/include/directfb/fusion/vector.h
-#usr/lib/directfb-1.7-7
-#usr/lib/directfb-1.7-7/gfxdrivers
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ati128.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_ep9x.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i810.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_i830.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_mach64.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_matrox.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_neomagic.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nsc.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_nvidia.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_pxa3xx.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sdlgraphics.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_sis315.so
-#usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.la
-usr/lib/directfb-1.7-7/gfxdrivers/libdirectfb_tdfx.so
-#usr/lib/directfb-1.7-7/inputdrivers
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_input_hub.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_joystick.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_keyboard.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_linux_input.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_lirc.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_mutouch.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_penmount.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_ps2mouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sdlinput.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_serialmouse.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_sonypi.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_wm97xx_ts.so
-#usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.la
-usr/lib/directfb-1.7-7/inputdrivers/libdirectfb_zytronic.so
-#usr/lib/directfb-1.7-7/interfaces
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager
-#usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.la
-usr/lib/directfb-1.7-7/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBFont/libidirectfbfont_ft2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_bmp.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_mpeg2.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_pnm.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_tiff.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows
-#usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.la
-usr/lib/directfb-1.7-7/interfaces/IDirectFBWindows/libidirectfbwindows_default.so
-#usr/lib/directfb-1.7-7/interfaces/IWater
-#usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.la
-usr/lib/directfb-1.7-7/interfaces/IWater/libiwater_default.so
-#usr/lib/directfb-1.7-7/systems
-#usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_devmem.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_dummy.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_fbdev.so
-#usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.la
-usr/lib/directfb-1.7-7/systems/libdirectfb_sdl.so
-#usr/lib/directfb-1.7-7/wm
-#usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.la
-usr/lib/directfb-1.7-7/wm/libdirectfbwm_default.so
-usr/lib/lib++dfb-1.7.so.7
-usr/lib/lib++dfb-1.7.so.7.0.0
-#usr/lib/lib++dfb.la
-#usr/lib/lib++dfb.so
-usr/lib/libdirect-1.7.so.7
-usr/lib/libdirect-1.7.so.7.0.0
-#usr/lib/libdirect.la
-usr/lib/libdirect.so
-usr/lib/libdirectfb-1.7.so.7
-usr/lib/libdirectfb-1.7.so.7.0.0
-#usr/lib/libdirectfb.la
-usr/lib/libdirectfb.so
-usr/lib/libfusion-1.7.so.7
-usr/lib/libfusion-1.7.so.7.0.0
-#usr/lib/libfusion.la
-usr/lib/libfusion.so
-#usr/lib/pkgconfig/++dfb.pc
-#usr/lib/pkgconfig/direct.pc
-#usr/lib/pkgconfig/directfb-internal.pc
-#usr/lib/pkgconfig/directfb.pc
-#usr/lib/pkgconfig/fusion.pc
-#usr/share/directfb-1.7.7
-#usr/share/directfb-1.7.7/cursor.dat
-#usr/share/directfb-1.7.7/cursor.png
-#usr/share/directfb-1.7.7/decker.dgiff
-#usr/share/directfb-1.7.7/decker.ttf
-#usr/share/man/man1/dfbg.1
-#usr/share/man/man1/directfb-csource.1
-#usr/share/man/man5/directfbrc.5
diff --git a/lfs/directfb b/lfs/directfb
deleted file mode 100644
index 8b2ff6022..000000000
--- a/lfs/directfb
+++ /dev/null
@@ -1,93 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 1.7.7
-
-THISAPP = DirectFB-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = directfb
-PAK_VER = 3
-
-DEPS = ""
-
-
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 152cf1863b1a3a28aa1370e9053440bf
-
-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 zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/DirectFB-1.7.7-fix_mknod.patch
-
- cd $(DIR_APP) && ./configure \
- --prefix=/usr \
- --disable-x11 \
- --enable-sdl \
- --enable-video4linux2
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 8393cad2f..ca02c40f4 100755
--- a/make.sh
+++ b/make.sh
@@ -1454,7 +1454,6 @@ buildipfire() {
lfsmake2 icinga
lfsmake2 observium-agent
lfsmake2 ebtables
- lfsmake2 directfb
lfsmake2 faad2
lfsmake2 alac
lfsmake2 ffmpeg
diff --git a/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch b/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch
deleted file mode 100644
index 078754ef3..000000000
--- a/src/patches/DirectFB-1.7.7-add-missing-davinci-files.patch
+++ /dev/null
@@ -1,1717 +0,0 @@
-From: Sebastian Ramacher <sramacher(a)debian.org>
-Date: Thu, 16 Mar 2017 20:53:09 +0100
-Subject: Add missing files from upstream
-
-Closes: #598976
----
- gfxdrivers/davinci/davinci_c64x.h | 935 +++++++++++++++++++++++++++++++++
- gfxdrivers/davinci/davinci_gfxdriver.h | 169 ++++++
- gfxdrivers/davinci/davincifb.h | 581 ++++++++++++++++++++
- 3 files changed, 1685 insertions(+)
- create mode 100644 gfxdrivers/davinci/davinci_c64x.h
- create mode 100644 gfxdrivers/davinci/davinci_gfxdriver.h
- create mode 100644 gfxdrivers/davinci/davincifb.h
-
-diff --git a/gfxdrivers/davinci/davinci_c64x.h b/gfxdrivers/davinci/davinci_c64x.h
-new file mode 100644
-index 0000000..682da22
---- /dev/null
-+++ b/gfxdrivers/davinci/davinci_c64x.h
-@@ -0,0 +1,935 @@
-+/*
-+ TI Davinci driver - C64X+ DSP Library
-+
-+ (c) Copyright 2008 directfb.org
-+ (c) Copyright 2007 Telio AG
-+
-+ Written by Denis Oliver Kropp <dok(a)directfb.org> and
-+ Olaf Dreesen <olaf(a)directfb.org>.
-+
-+ All rights reserved.
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU General Public License
-+ version 2 as published by the Free Software Foundation.
-+
-+ This library 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 library; if not, write to the
-+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA.
-+*/
-+
-+#ifndef __DAVINCI_C64X_H__
-+#define __DAVINCI_C64X_H__
-+
-+#include <unistd.h>
-+
-+#include <directfb.h>
-+
-+#include <direct/messages.h>
-+#include <direct/trace.h>
-+
-+#include <linux/c64x.h>
-+
-+#define mb() __asm__ __volatile__ ("" : : : "memory")
-+
-+/**********************************************************************************************************************/
-+
-+typedef struct {
-+ int magic;
-+
-+ int fd;
-+ c64xTaskControl *ctl;
-+ void *mem;
-+
-+ c64xTask *QueueL;
-+} DavinciC64x;
-+
-+typedef struct {
-+ int magic;
-+ unsigned int max_tasks;
-+ unsigned int num_tasks;
-+ c64xTask *tasks;
-+} DavinciC64xTasks;
-+
-+typedef enum {
-+ C64X_TEF_NONE = 0x0000,
-+ C64X_TEF_RESET = 0x0001
-+} DavinciC64xEmitFlags;
-+
-+/**********************************************************************************************************************/
-+
-+DFBResult davinci_c64x_open ( DavinciC64x *c64x );
-+
-+DFBResult davinci_c64x_close ( DavinciC64x *c64x );
-+
-+DFBResult davinci_c64x_wait_low( DavinciC64x *c64x );
-+
-+/**********************************************************************************************************************/
-+
-+DFBResult davinci_c64x_tasks_init ( DavinciC64xTasks *tasks,
-+ unsigned int size );
-+
-+DFBResult davinci_c64x_tasks_destroy( DavinciC64xTasks *tasks );
-+
-+/**********************************************************************************************************************/
-+
-+DFBResult davinci_c64x_emit_tasks( DavinciC64x *c64x,
-+ DavinciC64xTasks *tasks,
-+ DavinciC64xEmitFlags flags );
-+
-+/**********************************************************************************************************************/
-+
-+static const char *state_names[] = { "DONE", "ERROR", "TODO", "RUNNING" };
-+
-+static inline c64xTask *
-+c64x_get_task( DavinciC64x *c64x )
-+{
-+ c64xTaskControl *ctl = c64x->ctl;
-+ uint32_t idx = ctl->QL_arm;
-+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK;
-+ c64xTask *task = &c64x->QueueL[idx];
-+ int loops = 0;
-+ uint32_t idle = 0;
-+
-+ /* Wait for the entry (and next) to be processed by the DSP (rare case). */
-+ while (task->c64x_flags & C64X_FLAG_TODO || ctl->QL_dsp == next) {
-+ if (loops > 666 || (idle && ctl->idlecounter - idle > 666)) {
-+ c64xTask *dsp_task = &c64x->QueueL[ctl->QL_dsp];
-+
-+ D_PERROR( "Davinci/C64X+: Blocked! [DSP %d / %d (%s), ARM %d / %d (%s)]\n",
-+ ctl->QL_dsp,
-+ (dsp_task->c64x_function >> 2) & 0x3fff,
-+ state_names[dsp_task->c64x_function & 3],
-+ ctl->QL_arm,
-+ (task->c64x_function >> 2) & 0x3fff,
-+ state_names[task->c64x_function & 3] );
-+
-+ break;
-+ }
-+
-+ idle = ctl->idlecounter;
-+
-+ /* Queue is full, waiting 10-20ms should not be too bad. */
-+ if (loops++ > 10)
-+ usleep( 5000 );
-+ }
-+
-+ return task;
-+}
-+
-+static inline void
-+c64x_submit_task( DavinciC64x *c64x, c64xTask *task )
-+{
-+ c64xTaskControl *ctl = c64x->ctl;
-+ uint32_t idx = ctl->QL_arm;
-+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK;
-+
-+ mb();
-+
-+ ctl->QL_arm = next;
-+
-+ mb();
-+}
-+
-+/**********************************************************************************************************************/
-+
-+static inline void
-+davinci_c64x_wb_inv_range( DavinciC64x *c64x,
-+ unsigned long start,
-+ u32 length,
-+ u32 func )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = start;
-+ task->c64x_arg[1] = length;
-+ task->c64x_arg[2] = func;
-+
-+ task->c64x_function = C64X_WB_INV_RANGE | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_write_back_all( DavinciC64x *c64x )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_function = C64X_WRITE_BACK_ALL | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+/**********************************************************************************************************************/
-+
-+static inline void
-+davinci_c64x_load_block__L( DavinciC64xTasks *tasks,
-+ unsigned long words,
-+ u32 num,
-+ u32 flags )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = words;
-+ task->c64x_arg[1] = num;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_load_block( DavinciC64x *c64x,
-+ unsigned long words,
-+ u32 num,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = words;
-+ task->c64x_arg[1] = num;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_fetch_uyvy( DavinciC64x *c64x,
-+ unsigned long dest,
-+ unsigned long source,
-+ u32 pitch,
-+ u32 height,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = source;
-+ task->c64x_arg[2] = pitch;
-+ task->c64x_arg[3] = height;
-+ task->c64x_arg[4] = flags;
-+
-+ task->c64x_function = C64X_FETCH_UYVY | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_mc( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long source0,
-+ unsigned long source1,
-+ u32 spitch,
-+ u32 height,
-+ int func )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = source0;
-+ task->c64x_arg[3] = source1;
-+ task->c64x_arg[4] = spitch;
-+ task->c64x_arg[5] = height;
-+
-+ task->c64x_function = func | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_put_idct_uyvy_16x16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_put_idct_uyvy_16x16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_put_mc_uyvy_16x16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_put_mc_uyvy_16x16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_put_sum_uyvy_16x16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_put_sum_uyvy_16x16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = flags;
-+
-+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_dva_begin_frame__L( DavinciC64xTasks *tasks,
-+ u32 pitch,
-+ unsigned long current,
-+ unsigned long past,
-+ unsigned long future,
-+ u32 flags )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = pitch;
-+ task->c64x_arg[1] = current;
-+ task->c64x_arg[2] = past;
-+ task->c64x_arg[3] = future;
-+ task->c64x_arg[4] = flags;
-+
-+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_dva_begin_frame( DavinciC64x *c64x,
-+ u32 pitch,
-+ unsigned long current,
-+ unsigned long past,
-+ unsigned long future,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = pitch;
-+ task->c64x_arg[1] = current;
-+ task->c64x_arg[2] = past;
-+ task->c64x_arg[3] = future;
-+ task->c64x_arg[4] = flags;
-+
-+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_dva_motion_block__L( DavinciC64xTasks *tasks,
-+ unsigned long macroblock )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = macroblock;
-+
-+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_dva_motion_block( DavinciC64x *c64x,
-+ unsigned long macroblock )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = macroblock;
-+
-+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+/**********************************************************************************************************************/
-+
-+static inline void
-+davinci_c64x_dva_idct( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ unsigned long source )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = source;
-+
-+ task->c64x_function = C64X_DVA_IDCT | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+/**********************************************************************************************************************/
-+
-+static inline void
-+davinci_c64x_put_uyvy_16x16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ unsigned long source,
-+ u32 flags )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = source;
-+ task->c64x_arg[3] = flags;
-+
-+ task->c64x_function = C64X_PUT_UYVY_16x16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_dither_argb__L( DavinciC64xTasks *tasks,
-+ unsigned long dst_rgb,
-+ unsigned long dst_alpha,
-+ u32 dst_pitch,
-+ unsigned long source,
-+ u32 src_pitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dst_rgb;
-+ task->c64x_arg[1] = dst_alpha;
-+ task->c64x_arg[2] = dst_pitch;
-+ task->c64x_arg[3] = source;
-+ task->c64x_arg[4] = src_pitch;
-+ task->c64x_arg[5] = width;
-+ task->c64x_arg[6] = height;
-+
-+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_dither_argb( DavinciC64x *c64x,
-+ unsigned long dst_rgb,
-+ unsigned long dst_alpha,
-+ u32 dst_pitch,
-+ unsigned long source,
-+ u32 src_pitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dst_rgb;
-+ task->c64x_arg[1] = dst_alpha;
-+ task->c64x_arg[2] = dst_pitch;
-+ task->c64x_arg[3] = source;
-+ task->c64x_arg[4] = src_pitch;
-+ task->c64x_arg[5] = width;
-+ task->c64x_arg[6] = height;
-+
-+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_fill_16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 width,
-+ u32 height,
-+ u32 value )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = width;
-+ task->c64x_arg[3] = height;
-+ task->c64x_arg[4] = value;
-+
-+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_fill_16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 width,
-+ u32 height,
-+ u32 value )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = width;
-+ task->c64x_arg[3] = height;
-+ task->c64x_arg[4] = value;
-+
-+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_fill_32__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 width,
-+ u32 height,
-+ u32 value )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = width;
-+ task->c64x_arg[3] = height;
-+ task->c64x_arg[4] = value;
-+
-+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_fill_32( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 pitch,
-+ u32 width,
-+ u32 height,
-+ u32 value )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = pitch;
-+ task->c64x_arg[2] = width;
-+ task->c64x_arg[3] = height;
-+ task->c64x_arg[4] = value;
-+
-+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_blit_16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width;
-+ task->c64x_arg[5] = height;
-+
-+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_blit_16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width;
-+ task->c64x_arg[5] = height;
-+
-+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_blit_32__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width;
-+ task->c64x_arg[5] = height;
-+
-+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_blit_32( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width;
-+ task->c64x_arg[5] = height;
-+
-+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_stretch_32__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 dw,
-+ u32 dh,
-+ u32 sw,
-+ u32 sh,
-+ const DFBRegion *clip )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = src;
-+ task->c64x_arg[2] = dpitch | (spitch << 16);
-+ task->c64x_arg[3] = dh | (dw << 16);
-+ task->c64x_arg[4] = sh | (sw << 16);
-+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16);
-+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16);
-+
-+ if (sw > dw && sh > dh)
-+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO;
-+ else
-+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_stretch_32( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 dw,
-+ u32 dh,
-+ u32 sw,
-+ u32 sh,
-+ const DFBRegion *clip )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = src;
-+ task->c64x_arg[2] = dpitch | (spitch << 16);
-+ task->c64x_arg[3] = dh | (dw << 16);
-+ task->c64x_arg[4] = sh | (sw << 16);
-+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16);
-+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16);
-+
-+ if (sw > dw && sh > dh)
-+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO;
-+ else
-+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_blit_blend_32__L( DavinciC64xTasks *tasks,
-+ u32 sub_func,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 argb,
-+ u8 alpha )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width | (height << 16);
-+ task->c64x_arg[5] = argb;
-+ task->c64x_arg[6] = alpha;
-+
-+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_blit_blend_32( DavinciC64x *c64x,
-+ u32 sub_func,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 argb,
-+ u8 alpha )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = dpitch;
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = spitch;
-+ task->c64x_arg[4] = width | (height << 16);
-+ task->c64x_arg[5] = argb;
-+ task->c64x_arg[6] = alpha;
-+
-+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_blit_keyed_16__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 key,
-+ u32 mask )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = width;
-+ task->c64x_arg[4] = height;
-+ task->c64x_arg[5] = key;
-+ task->c64x_arg[6] = mask;
-+
-+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_blit_keyed_16( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 key,
-+ u32 mask )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = width;
-+ task->c64x_arg[4] = height;
-+ task->c64x_arg[5] = key;
-+ task->c64x_arg[6] = mask;
-+
-+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+static inline void
-+davinci_c64x_blit_keyed_32__L( DavinciC64xTasks *tasks,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 key,
-+ u32 mask )
-+{
-+ c64xTask *task = &tasks->tasks[tasks->num_tasks];
-+
-+ D_ASSERT( tasks->num_tasks < tasks->max_tasks );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = width;
-+ task->c64x_arg[4] = height;
-+ task->c64x_arg[5] = key;
-+ task->c64x_arg[6] = mask;
-+
-+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO;
-+
-+ tasks->num_tasks++;
-+}
-+
-+static inline void
-+davinci_c64x_blit_keyed_32( DavinciC64x *c64x,
-+ unsigned long dest,
-+ u32 dpitch,
-+ unsigned long src,
-+ u32 spitch,
-+ u32 width,
-+ u32 height,
-+ u32 key,
-+ u32 mask )
-+{
-+ c64xTask *task = c64x_get_task( c64x );
-+
-+ task->c64x_arg[0] = dest;
-+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff);
-+ task->c64x_arg[2] = src;
-+ task->c64x_arg[3] = width;
-+ task->c64x_arg[4] = height;
-+ task->c64x_arg[5] = key;
-+ task->c64x_arg[6] = mask;
-+
-+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO;
-+
-+ c64x_submit_task( c64x, task );
-+}
-+
-+#endif
-+
-diff --git a/gfxdrivers/davinci/davinci_gfxdriver.h b/gfxdrivers/davinci/davinci_gfxdriver.h
-new file mode 100644
-index 0000000..4ca79b3
---- /dev/null
-+++ b/gfxdrivers/davinci/davinci_gfxdriver.h
-@@ -0,0 +1,169 @@
-+/*
-+ TI Davinci driver - Graphics Driver
-+
-+ (c) Copyright 2007 Telio AG
-+
-+ Written by Denis Oliver Kropp <dok(a)directfb.org>
-+
-+ Code is derived from VMWare driver.
-+
-+ (c) Copyright 2001-2009 The world wide DirectFB Open Source Community (directfb.org)
-+ (c) Copyright 2000-2004 Convergence (integrated media) GmbH
-+
-+ All rights reserved.
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+
-+ This library 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
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this library; if not, write to the
-+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA.
-+*/
-+
-+#ifndef __DAVINCI_GFXDRIVER_H__
-+#define __DAVINCI_GFXDRIVER_H__
-+
-+#include <sys/ioctl.h>
-+#include <davincifb.h>
-+
-+#include <core/surface_buffer.h>
-+
-+#include "davincifb.h"
-+
-+#include "davinci_c64x.h"
-+
-+
-+typedef struct {
-+ /* validation flags */
-+ int v_flags;
-+
-+ /* cached/computed values */
-+ void *dst_addr;
-+ unsigned long dst_phys;
-+ unsigned int dst_size;
-+ unsigned long dst_pitch;
-+ DFBSurfacePixelFormat dst_format;
-+ unsigned long dst_bpp;
-+
-+ void *src_addr;
-+ unsigned long src_phys;
-+ unsigned long src_pitch;
-+ DFBSurfacePixelFormat src_format;
-+ unsigned long src_bpp;
-+
-+ unsigned long source_mult;
-+
-+ unsigned long fillcolor;
-+
-+ int blit_blend_sub_function;
-+ int draw_blend_sub_function;
-+
-+ DFBColor color;
-+ unsigned long color_argb;
-+ unsigned long colorkey;
-+
-+ DFBSurfaceBlittingFlags blitting_flags;
-+
-+ DFBRegion clip;
-+
-+ /** Add shared data here... **/
-+ struct fb_fix_screeninfo fix[4];
-+
-+ CoreSurfacePool *osd_pool;
-+ CoreSurfacePool *video_pool;
-+
-+ bool synced;
-+} DavinciDeviceData;
-+
-+
-+typedef struct {
-+ int num;
-+ int fd;
-+ void *mem;
-+ int size;
-+} DavinciFB;
-+
-+typedef struct {
-+ DavinciDeviceData *ddev;
-+
-+ CoreDFB *core;
-+
-+ CoreScreen *screen;
-+ CoreLayer *osd;
-+ CoreLayer *video;
-+
-+ DavinciFB fb[4];
-+
-+ DavinciC64x c64x;
-+ bool c64x_present;
-+
-+ DavinciC64xTasks tasks;
-+} DavinciDriverData;
-+
-+
-+static inline DFBResult
-+davincifb_pan_display( const DavinciFB *fb,
-+ struct fb_var_screeninfo *var,
-+ const CoreSurfaceBufferLock *lock,
-+ DFBSurfaceFlipFlags flags,
-+ int x,
-+ int y )
-+{
-+ int ret;
-+
-+ if (lock) {
-+#ifdef FBIO_SET_START
-+ CoreSurfaceBuffer *buffer = lock->buffer;
-+ struct fb_set_start set_start;
-+
-+ /* physical mode */
-+ set_start.offset = -1;
-+ set_start.sync = (flags & DSFLIP_ONSYNC) ? 1 : 0;
-+
-+ /* life's so easy */
-+ set_start.physical = lock->phys + DFB_BYTES_PER_LINE( buffer->format, x ) + y * lock->pitch;
-+
-+ ret = ioctl( fb->fd, FBIO_SET_START, &set_start );
-+ if (ret < 0)
-+ D_DEBUG( "FBIO_SET_START (0x%08lx, sync %llu) failed!\n",
-+ set_start.physical, set_start.sync );
-+
-+ if (ret == 0) {
-+ if (flags & DSFLIP_WAIT)
-+ ioctl( fb->fd, FBIO_WAITFORVSYNC );
-+
-+ return DFB_OK;
-+ }
-+
-+ /* fallback */
-+#endif
-+ var->xoffset = x; /* poor version */
-+ var->yoffset = y + lock->offset / lock->pitch;
-+ }
-+ else {
-+ var->xoffset = x;
-+ var->yoffset = y;
-+ }
-+
-+ var->activate = /*(flags & DSFLIP_ONSYNC) ? FB_ACTIVATE_VBL :*/ FB_ACTIVATE_NOW;
-+
-+ ret = ioctl( fb->fd, FBIOPAN_DISPLAY, var );
-+ if (ret)
-+ D_PERROR( "Davinci/FB: FBIOPAN_DISPLAY (fb%d - %d,%d) failed!\n",
-+ fb->num, var->xoffset, var->yoffset );
-+
-+ if (flags & DSFLIP_WAIT)
-+ ioctl( fb->fd, FBIO_WAITFORVSYNC );
-+
-+ return DFB_OK;
-+}
-+
-+#endif
-diff --git a/gfxdrivers/davinci/davincifb.h b/gfxdrivers/davinci/davincifb.h
-new file mode 100644
-index 0000000..35eb169
---- /dev/null
-+++ b/gfxdrivers/davinci/davincifb.h
-@@ -0,0 +1,581 @@
-+/*
-+ * Copyright (C) 2006 Texas Instruments Inc
-+ *
-+ * 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 2 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, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ * File: davincifb.h
-+ */
-+
-+#ifndef DAVINVI_VPBE_H
-+#define DAVINVI_VPBE_H
-+
-+/* include Linux files */
-+#include <linux/fb.h>
-+
-+/* define the custom FBIO_WAITFORVSYNC ioctl */
-+#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t)
-+#define FBIO_SETATTRIBUTE _IOW('F', 0x21, struct fb_fillrect)
-+
-+/* Backported IOCTLS. */
-+#define FBIO_SETPOSX _IOW('F', 0x22, u_int32_t)
-+#define FBIO_SETPOSY _IOW('F', 0x23, u_int32_t)
-+#define FBIO_SETZOOM _IOW('F', 0x24, struct zoom_params)
-+#define FBIO_GETSTD _IOR('F', 0x25, u_int32_t)
-+#define FBIO_RESIZER _IOW('F', 0x26, struct vpfe_resizer_params)
-+#define FBIO_SYNC _IOW('F', 0x27, u_int32_t)
-+
-+typedef struct zoom_params {
-+ u_int32_t window_id;
-+ u_int32_t zoom_h;
-+ u_int32_t zoom_v;
-+} zoom_params_t;
-+
-+typedef struct vpfe_resizer_params
-+{
-+ u_int32_t rsz_cnt; //busy-lock
-+ u_int32_t out_size; //busy-lock
-+ u_int32_t in_start; //busy-lock
-+ u_int32_t in_size; //busy-lock
-+ u_int32_t sdr_inadd; //shadowed
-+ u_int32_t sdr_inoff; //shadowed
-+ u_int32_t sdr_outadd; //shadowed
-+ u_int32_t sdr_outoff; //shadowed
-+ u_int32_t hfilt[16]; //busy-lock
-+ u_int32_t vfilt[16]; //busy-lock
-+ u_int32_t yenh; //busy-lock
-+} vpfe_resizer_params_t;
-+
-+typedef struct fb_set_start {
-+ int offset; /* offset from smem_start */
-+ unsigned long physical; /* absolute physical address when offset < 0 */
-+
-+ u_int64_t sync; /* input: target sync counter for change or 0 for no sync at all,
-+ output: sync counter of actual change or 0 if still pending */
-+} fb_set_start_t;
-+
-+
-+#ifdef _IOC_TYPECHECK
-+#undef _IOC_TYPECHECK
-+#define _IOC_TYPECHECK(x) (sizeof(x))
-+#endif
-+
-+#define RAM_CLUT_SIZE 256*3
-+#define FBIO_ENABLE_DISABLE_WIN \
-+ _IOW('F', 0x30, unsigned char)
-+#define FBIO_SET_BITMAP_BLEND_FACTOR \
-+ _IOW('F', 0x31, vpbe_bitmap_blend_params_t)
-+#define FBIO_SET_BITMAP_WIN_RAM_CLUT \
-+ _IOW('F', 0x32, unsigned char)*RAM_CLUT_SIZE)
-+#define FBIO_ENABLE_DISABLE_ATTRIBUTE_WIN \
-+ _IOW('F', 0x33, unsigned int)
-+#define FBIO_GET_BLINK_INTERVAL \
-+ _IOR('F', 0x34, vpbe_blink_option_t)
-+#define FBIO_SET_BLINK_INTERVAL \
-+ _IOW('F', 0x35, vpbe_blink_option_t)
-+#define FBIO_GET_VIDEO_CONFIG_PARAMS \
-+ _IOR('F', 0x36, vpbe_video_config_params_t)
-+#define FBIO_SET_VIDEO_CONFIG_PARAMS \
-+ _IOW('F', 0x37, vpbe_video_config_params_t)
-+#define FBIO_GET_BITMAP_CONFIG_PARAMS \
-+ _IOR('F', 0x38, vpbe_bitmap_config_params_t)
-+#define FBIO_SET_BITMAP_CONFIG_PARAMS \
-+ _IOW('F', 0x39, vpbe_bitmap_config_params_t)
-+#define FBIO_SET_DCLK \
-+ _IOW('F', 0x40, vpbe_dclk_t)
-+#define FBIO_SET_INTERFACE \
-+ _IOW('F', 0x41, unsigned char)
-+#define FBIO_GET_INTERFACE \
-+ _IOR('F', 0x42, unsigned char)
-+#define FBIO_QUERY_TIMING \
-+ _IOWR('F', 0x43, struct vpbe_mode_info)
-+#define FBIO_SET_TIMING \
-+ _IOW('F', 0x44, struct vpbe_fb_videomode)
-+#define FBIO_GET_TIMING \
-+ _IOR('F', 0x45, struct vpbe_fb_videomode)
-+#define FBIO_SET_VENC_CLK_SOURCE \
-+ _IOW('F', 0x46, unsigned char)
-+#define FBIO_SET_BACKG_COLOR \
-+ _IOW('F', 0x47, vpbe_backg_color_t)
-+#define FBIO_ENABLE_DISPLAY \
-+ _IOW('F', 0x48, unsigned char)
-+#define FBIO_SETPOS \
-+ _IOW('F', 0x49, u_int32_t)
-+#define FBIO_SET_CURSOR \
-+ _IOW('F', 0x50, struct fb_cursor)
-+#define FBIO_SET_START \
-+ _IOW('F', 0x66, struct fb_set_start)
-+
-+/*
-+ * Defines and Constants
-+ */
-+#ifdef __KERNEL__
-+#define DAVINCIFB_DEVICE "davincifb"
-+#define DAVINCIFB_DRIVER "davincifb"
-+
-+#define MULTIPLE_BUFFERING 1
-+
-+#ifdef MULTIPLE_BUFFERING
-+#define DOUBLE_BUF 2
-+#define TRIPLE_BUF 3
-+#else
-+#define DOUBLE_BUF 1
-+#define TRIPLE_BUF 1
-+#endif
-+
-+/* usage: if (is_win(info->fix.id, OSD0)) ... */
-+#define is_win(name, x) ((strcmp(name, x ## _FBNAME) == 0) ? 1 : 0)
-+
-+/*
-+ * display controller register I/O routines
-+ */
-+u32 dispc_reg_in(u32 offset);
-+u32 dispc_reg_out(u32 offset, u32 val);
-+u32 dispc_reg_merge(u32 offset, u32 val, u32 mask);
-+
-+#endif /*__KERNEL__*/
-+
-+/* Error return codes */
-+#define VPBE_INVALID_PARA_VALUE 700
-+#define VPBE_WRONG_WINDOW_ID 701
-+#define VPBE_CURRENTLY_IN_REQUIRED_MODE 702
-+#define VPBE_INSUFFICIENT_CLUT_VALUES 703
-+#define VPBE_CLUT_WRITE_TIMEOUT 704
-+#define VPBE_VID0_BUF_ADR_NULL 705
-+#define VPBE_WINDOW_NOT_DISABLED 706
-+#define VPBE_WINDOW_NOT_ENABLED 707
-+
-+#ifndef __KERNEL__
-+/* Window ID definations */
-+#define OSD0 0
-+#define VID0 1
-+#define OSD1 2
-+#define VID1 3
-+#endif
-+
-+/* There are 4 framebuffers, each represented by an fb_info and
-+ * a dm_win_info structure */
-+#define OSD0_FBNAME "dm_osd0_fb"
-+#define OSD1_FBNAME "dm_osd1_fb"
-+#define VID0_FBNAME "dm_vid0_fb"
-+#define VID1_FBNAME "dm_vid1_fb"
-+
-+/* FIXME: Digital LCD RGB matrix coefficients */
-+#define DLCD_DGY_VAL 0
-+#define DLCD_DRV_VAL 0
-+#define DLCD_DGU_VAL 0
-+#define DLCD_DBU_VAL 0
-+
-+/* Defines for bitmap format */
-+#define VPBE_BITMAP_BIT_1 1
-+#define VPBE_BITMAP_BIT_2 2
-+#define VPBE_BITMAP_BIT_4 4
-+#define VPBE_BITMAP_BIT_8 8
-+#define VPBE_BITMAP_RGB565 16
-+#define VPBE_VIDEO_YUV422 16
-+#define VPBE_VIDEO_RGB888 24
-+
-+/* Defines foe cursor parameter validation*/
-+#define MAX_CURSOR_WIDTH 0x3FF
-+#define MAX_CURSOR_HEIGHT 0x1FF
-+#define MAX_CURSOR_LINEWIDTH 7
-+
-+#define BASEX 0x80
-+#define BASEY 0x12
-+#define BASEX_DLCD 0x59
-+#define BASEY_DLCD 0x22
-+
-+/*
-+ * Enumerations
-+ */
-+/* Enum for blending factor */
-+typedef enum vpbe_blend_factor {
-+ OSD_CONTRIBUTION_ZERO = 0,
-+ OSD_CONTRIBUTION_1_BY_8 = 1,
-+ OSD_CONTRIBUTION_2_BY_8 = 2,
-+ OSD_CONTRIBUTION_3_BY_8 = 3,
-+ OSD_CONTRIBUTION_4_BY_8 = 4,
-+ OSD_CONTRIBUTION_5_BY_8 = 5,
-+ OSD_CONTRIBUTION_6_BY_8 = 6,
-+ OSD_CONTRIBUTION_ONE = 7
-+} vpbe_blend_factor_t;
-+
-+/* Enum for Boolean variables */
-+typedef enum {
-+ SET_0 = 0,
-+ SET_1 = 1
-+} CB_CR_ORDER, ATTRIBUTE, ROM_RAM_CLUT;
-+
-+/* Defines for Display Interface */
-+#define PRGB 0
-+#define COMPOSITE 1
-+#define SVIDEO 2
-+#define COMPONENT 3
-+#define RGB 4
-+#define YCC16 5
-+#define YCC8 6
-+#define SRGB 7
-+#define EPSON 8
-+#define CASIO1G 9
-+#define UDISP 10
-+#define STN 11
-+#define VPBE_MAX_INTERFACES 12
-+
-+/* Defines for Display Mode */
-+#define LCD 0
-+#define NTSC 1
-+#define PAL 2
-+#define P525 3
-+#define P625 4
-+
-+#define DEFAULT_MODE 0
-+#define P480 0
-+#define P400 1
-+#define P350 2
-+#define NON_EXISTING_MODE 255
-+/* Enable/Disable enum */
-+typedef enum {
-+ VPBE_DISABLE = 0,
-+ VPBE_ENABLE = 1
-+} ATTENUATION, TRANSPARENCY, EXPANSION, BLINKING;
-+
-+typedef enum clk_source {
-+ CLK_SOURCE_CLK27 = 0,
-+ CLK_SOURCE_CLK54 = 1,
-+ CLK_SOURCE_VPBECLK = 2
-+} CLK_SOURCE;
-+
-+/*
-+ * Structures and Union Definitions
-+ */
-+
-+/* Structure for transparency and the blending factor for the bitmap window */
-+typedef struct vpbe_bitmap_blend_params {
-+ unsigned int colorkey; /* color key to be blend */
-+ unsigned int enable_colorkeying; /* enable color keying */
-+ unsigned int bf; /* valid range from 0 to 7 only. */
-+} vpbe_bitmap_blend_params_t;
-+
-+/* Structure for window expansion */
-+typedef struct vpbe_win_expansion {
-+ EXPANSION horizontal;
-+ EXPANSION vertical; /* 1: Enable 0:disable */
-+} vpbe_win_expansion_t;
-+
-+/* Structure for OSD window blinking options */
-+typedef struct vpbe_blink_option {
-+ BLINKING blinking; /* 1: Enable blinking 0: Disable */
-+ unsigned int interval; /* Valid only if blinking is 1 */
-+} vpbe_blink_option_t;
-+
-+/* Structure for DCLK parameters */
-+typedef struct vpbe_dclk {
-+ unsigned char dclk_pattern_width;
-+ unsigned int dclk_pattern0;
-+ unsigned int dclk_pattern1;
-+ unsigned int dclk_pattern2;
-+ unsigned int dclk_pattern3;
-+} vpbe_dclk_t;
-+
-+/* Structure for display format */
-+typedef struct vpbe_display_format {
-+ unsigned char interface; /* Output interface type */
-+ unsigned char mode; /* output mode */
-+} vpbe_display_format_t;
-+
-+/* Structure for background color */
-+typedef struct vpbe_backg_color {
-+ unsigned char clut_select; /* 2: RAM CLUT 1:ROM1 CLUT 0:ROM0 CLUT */
-+ unsigned char color_offset; /* index of color */
-+} vpbe_backg_color_t;
-+
-+/* Structure for Video window configurable parameters */
-+typedef struct vpbe_video_config_params {
-+ CB_CR_ORDER cb_cr_order; /*Cb/Cr order in input data for a pixel. */
-+ /* 0: cb cr 1: cr cb */
-+ vpbe_win_expansion_t exp_info; /* HZ/VT Expansion enable disable */
-+} vpbe_video_config_params_t;
-+
-+/*Union of structures giving the CLUT index for the 1, 2, 4 bit bitmap values.*/
-+typedef union vpbe_clut_idx {
-+ struct _for_4bit_bimap {
-+ unsigned char bitmap_val_0;
-+ unsigned char bitmap_val_1;
-+ unsigned char bitmap_val_2;
-+ unsigned char bitmap_val_3;
-+ unsigned char bitmap_val_4;
-+ unsigned char bitmap_val_5;
-+ unsigned char bitmap_val_6;
-+ unsigned char bitmap_val_7;
-+ unsigned char bitmap_val_8;
-+ unsigned char bitmap_val_9;
-+ unsigned char bitmap_val_10;
-+ unsigned char bitmap_val_11;
-+ unsigned char bitmap_val_12;
-+ unsigned char bitmap_val_13;
-+ unsigned char bitmap_val_14;
-+ unsigned char bitmap_val_15;
-+ } for_4bit_bimap;
-+ struct _for_2bit_bimap {
-+ unsigned char bitmap_val_0;
-+ unsigned char dummy0[4];
-+ unsigned char bitmap_val_1;
-+ unsigned char dummy1[4];
-+ unsigned char bitmap_val_2;
-+ unsigned char dummy2[4];
-+ unsigned char bitmap_val_3;
-+ } for_2bit_bimap;
-+ struct _for_1bit_bimap {
-+ unsigned char bitmap_val_0;
-+ unsigned char dummy0[14];
-+ unsigned char bitmap_val_1;
-+ } for_1bit_bimap;
-+} vpbe_clut_idx_t;
-+
-+/* Structure for bitmap window configurable parameters */
-+typedef struct vpbe_bitmap_config_params {
-+ /* Only for bitmap width = 1,2,4 bits */
-+ vpbe_clut_idx_t clut_idx;
-+ /* Attenuation value for YUV o/p for bitmap window */
-+ unsigned char attenuation_enable;
-+ /* 0: ROM DM270, 1:ROM DM320, 2:RAM CLUT */
-+ unsigned char clut_select;
-+} vpbe_bitmap_config_params_t;
-+
-+/* Unioun for video/OSD configuration parameters */
-+typedef union vpbe_conf_params {
-+
-+ struct vpbe_video_params {
-+ CB_CR_ORDER cb_cr_order;
-+ /* HZ/VT Expansion enable disable */
-+ vpbe_win_expansion_t exp_info;
-+ } video_params;
-+
-+ struct vpbe_bitmap_params {
-+ /* Attenuation value for YUV o/p */
-+ ATTENUATION attenuation_enable;
-+ /* 0: ROM DM270, 1: ROM DM320, 2:RAM CLUT */
-+ unsigned char clut_select;
-+ /* Only for bitmap width = 1,2,4 bits */
-+ vpbe_clut_idx_t clut_idx;
-+ /* 0: OSD window is bitmap window */
-+ /* 1: OSD window is attribute window */
-+ ATTRIBUTE enable_attribute;
-+ /* To hold bps value.
-+ Used to switch back from attribute to bitmap. */
-+ unsigned int stored_bits_per_pixel;
-+ /* Blending information */
-+ vpbe_bitmap_blend_params_t blend_info;
-+ /* OSD Blinking information */
-+ vpbe_blink_option_t blink_info;
-+ } bitmap_params;
-+
-+} vpbe_conf_params_t;
-+
-+typedef struct vpbe_video_params vpbe_video_params_t;
-+typedef struct vpbe_bitmap_params vpbe_bitmap_params_t;
-+
-+/* Structure to hold window position */
-+typedef struct vpbe_window_position {
-+ unsigned int xpos; /* X position of the window */
-+ unsigned int ypos; /* Y position of the window */
-+} vpbe_window_position_t;
-+
-+#ifdef __KERNEL__
-+/* Structure for each window */
-+typedef struct vpbe_dm_win_info {
-+ struct fb_info info;
-+ vpbe_window_position_t win_pos; /* X,Y position of window */
-+ /* Size of window is already there in var_info structure. */
-+
-+ dma_addr_t fb_base_phys; /*framebuffer area */
-+ unsigned int fb_base; /*window memory pointer */
-+ unsigned int fb_size; /*memory size */
-+ unsigned int pseudo_palette[17];
-+ int alloc_fb_mem;
-+ /*flag to identify if framebuffer area is fixed or not */
-+ unsigned long sdram_address;
-+ struct vpbe_dm_info *dm;
-+ unsigned char window_enable; /*Additions for all windows */
-+ zoom_params_t zoom; /*Zooming parameters */
-+ unsigned char field_frame_select; /*To select Field or frame */
-+ unsigned char numbufs; /*Number of buffers valid 2 or 3 */
-+ vpbe_conf_params_t conf_params;
-+ /*window configuration parameter union pointer */
-+} vpbe_dm_win_info_t;
-+#endif /*__KERNEL__*/
-+
-+/*
-+ * Videmode structure for display interface and mode settings
-+ */
-+typedef struct vpbe_fb_videomode {
-+ unsigned char name[10]; /* Mode name ( NTSC , PAL) */
-+ unsigned int vmode; /* FB_MODE_INTERLACED or FB_MODE_NON_INTERLACED */
-+ unsigned int xres; /* X Resolution of the display */
-+ unsigned int yres; /* Y Resolution of the display */
-+ unsigned int fps; /* frames per second */
-+ /* Timing Parameters applicable for std = 0 only */
-+ unsigned int left_margin;
-+ unsigned int right_margin;
-+ unsigned int upper_margin;
-+ unsigned int lower_margin;
-+ unsigned int hsync_len;
-+ unsigned int vsync_len;
-+ unsigned int sync; /* 0: hsync -ve/vsync -ve */
-+ /*1: hsync -ve/vsync +ve */
-+ /*2: hsync +ve/vsync -ve */
-+ /*3: hsync +ve/vsync +ve */
-+ unsigned int basepx; /* Display x,y start position */
-+ unsigned int basepy;
-+/* 1= Mode s available in modelist 0=Mode is not available in modelist */
-+ unsigned int std;
-+} vpbe_fb_videomode_t;
-+
-+/* Structure to interface videomode to application*/
-+typedef struct vpbe_mode_info {
-+ vpbe_fb_videomode_t vid_mode;
-+ unsigned char interface;
-+ unsigned char mode_idx;
-+} vpbe_mode_info_t;
-+
-+#ifdef __KERNEL__
-+/*
-+ * Structure for the driver holding information of windows,
-+ * memory base addresses etc.
-+ */
-+typedef struct vpbe_dm_info {
-+ vpbe_dm_win_info_t *osd0;
-+ vpbe_dm_win_info_t *osd1;
-+ vpbe_dm_win_info_t *vid0;
-+ vpbe_dm_win_info_t *vid1;
-+
-+/* to map the registers */
-+ dma_addr_t mmio_base_phys;
-+ unsigned int mmio_base;
-+ unsigned int mmio_size;
-+
-+ wait_queue_head_t vsync_wait;
-+ unsigned int vsync_cnt;
-+ int timeout;
-+
-+ /* this is the function that configures the output device (NTSC/PAL/LCD)
-+ * for the required output format (composite/s-video/component/rgb)
-+ */
-+ void (*output_device_config) (void);
-+
-+ struct device *dev;
-+
-+ vpbe_backg_color_t backg; /* background color */
-+ vpbe_dclk_t dclk; /*DCLK parameters */
-+ vpbe_display_format_t display; /*Display interface and mode */
-+ vpbe_fb_videomode_t videomode; /*Cuurent videomode */
-+ char ram_clut[256][3]; /*RAM CLUT array */
-+ struct fb_cursor cursor; /* cursor config params from fb.h */
-+/*Flag that indicates whether any of the display is enabled or not*/
-+ int display_enable;
-+} vpbe_dm_info_t;
-+
-+/*
-+ * Functions Definitions for 'davincifb' module
-+ */
-+int vpbe_mem_alloc_window_buf(vpbe_dm_win_info_t *);
-+int vpbe_mem_release_window_buf(vpbe_dm_win_info_t *);
-+void init_display_function(vpbe_display_format_t *);
-+int vpbe_mem_alloc_struct(vpbe_dm_win_info_t **);
-+void set_vid0_default_conf(void);
-+void set_vid1_default_conf(void);
-+void set_osd0_default_conf(void);
-+void set_osd1_default_conf(void);
-+void set_cursor_default_conf(void);
-+void set_dm_default_conf(void);
-+void set_win_enable(char *, unsigned int);
-+int within_vid0_limits(u32, u32, u32, u32);
-+void vpbe_set_display_default(void);
-+#ifdef __KERNEL__
-+void set_win_position(char *, u32, u32, u32, u32);
-+void change_win_param(int);
-+void set_interlaced(char *, unsigned int);
-+#endif /* __KERNEL__ */
-+
-+/*
-+ * Function definations for 'osd' module
-+ */
-+
-+int vpbe_enable_window(vpbe_dm_win_info_t *);
-+int vpbe_disable_window(vpbe_dm_win_info_t *);
-+int vpbe_vid_osd_select_field_frame(u8 *, u8);
-+int vpbe_bitmap_set_blend_factor(u8 *, vpbe_bitmap_blend_params_t *);
-+int vpbe_bitmap_set_ram_clut(void);
-+int vpbe_enable_disable_attribute_window(u32);
-+int vpbe_get_blinking(u8 *, vpbe_blink_option_t *);
-+int vpbe_set_blinking(u8 *, vpbe_blink_option_t *);
-+int vpbe_set_vid_params(u8 *, vpbe_video_config_params_t *);
-+int vpbe_get_vid_params(u8 *, vpbe_video_config_params_t *);
-+int vpbe_bitmap_get_params(u8 *, vpbe_bitmap_config_params_t *);
-+int vpbe_bitmap_set_params(u8 *, vpbe_bitmap_config_params_t *);
-+int vpbe_set_cursor_params(struct fb_cursor *);
-+int vpbe_set_vid_expansion(vpbe_win_expansion_t *);
-+int vpbe_set_dclk(vpbe_dclk_t *);
-+int vpbe_set_display_format(vpbe_display_format_t *);
-+int vpbe_set_backg_color(vpbe_backg_color_t *);
-+int vpbe_set_interface(u8);
-+int vpbe_query_mode(vpbe_mode_info_t *);
-+int vpbe_set_mode(struct vpbe_fb_videomode *);
-+int vpbe_set_venc_clk_source(u8);
-+void set_vid0_default_conf(void);
-+void set_osd0_default_conf(void);
-+void set_vid1_default_conf(void);
-+void set_osd1_default_conf(void);
-+void set_cursor_default_conf(void);
-+void set_dm_default_conf(void);
-+/*
-+ * Function definations for 'venc' module
-+ */
-+
-+void davincifb_ntsc_composite_config(void);
-+void davincifb_ntsc_svideo_config(void);
-+void davincifb_ntsc_component_config(void);
-+void davincifb_pal_composite_config(void);
-+void davincifb_pal_svideo_config(void);
-+void davincifb_pal_component_config(void);
-+
-+void vpbe_davincifb_ntsc_rgb_config(void);
-+void vpbe_davincifb_pal_rgb_config(void);
-+void vpbe_davincifb_525p_component_config(void);
-+void vpbe_davincifb_625p_component_config(void);
-+
-+void vpbe_enable_venc(int);
-+void vpbe_enable_dacs(int);
-+/*
-+ * Function definations for 'dlcd' module
-+ */
-+void vpbe_davincifb_480p_prgb_config(void);
-+void vpbe_davincifb_400p_prgb_config(void);
-+void vpbe_davincifb_350p_prgb_config(void);
-+void vpbe_set_display_timing(struct vpbe_fb_videomode *);
-+
-+void vpbe_enable_lcd(int);
-+/*
-+ * Following functions are not implemented
-+ */
-+void vpbe_davincifb_default_ycc16_config(void);
-+void vpbe_davincifb_default_ycc8_config(void);
-+void vpbe_davincifb_default_srgb_config(void);
-+void vpbe_davincifb_default_epson_config(void);
-+void vpbe_davincifb_default_casio_config(void);
-+void vpbe_davincifb_default_UDISP_config(void);
-+void vpbe_davincifb_default_STN_config(void);
-+#endif /*__KERNEL__*/
-+
-+#endif /* End of #ifndef DAVINCI_VPBE_H */
diff --git a/src/patches/DirectFB-1.7.7-fix_mknod.patch b/src/patches/DirectFB-1.7.7-fix_mknod.patch
deleted file mode 100644
index 12ac2cac5..000000000
--- a/src/patches/DirectFB-1.7.7-fix_mknod.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Debian Multimedia Maintainers
- <pkg-multimedia-maintainers(a)lists.alioth.debian.org>
-Date: Thu, 16 Mar 2017 20:48:20 +0100
-Subject: _fix_mknod
-
----
- gfxdrivers/davinci/davinci_c64x.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gfxdrivers/davinci/davinci_c64x.c b/gfxdrivers/davinci/davinci_c64x.c
-index 431ffdd..420b567 100644
---- a/gfxdrivers/davinci/davinci_c64x.c
-+++ b/gfxdrivers/davinci/davinci_c64x.c
-@@ -37,6 +37,8 @@
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <unistd.h>
-
- #include <directfb_util.h>
--
2.20.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 13/14] Drop VDR
2020-02-12 9:34 Drop unused/unmaintained packages Michael Tremer
` (11 preceding siblings ...)
2020-02-12 9:34 ` [PATCH 12/14] Drop streamripper Michael Tremer
@ 2020-02-12 9:34 ` Michael Tremer
2020-02-12 9:34 ` [PATCH 14/14] Drop w_scan Michael Tremer
2020-02-15 17:49 ` Drop unused/unmaintained packages Arne Fitzenreiter
14 siblings, 0 replies; 16+ messages in thread
From: Michael Tremer @ 2020-02-12 9:34 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 194245 bytes --]
This package is outdated and does not compile any more. VDR itself
could probably be fixed, but the plugins are mostly unmaintained.
Since VDR is useless without the plugins, this is being dropped.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/backup/includes/vdr | 2 -
config/rootfiles/common/aarch64/initscripts | 3 -
config/rootfiles/common/armv5tel/initscripts | 3 -
config/rootfiles/common/i586/initscripts | 3 -
config/rootfiles/common/x86_64/initscripts | 3 -
config/rootfiles/packages/armv5tel/vdr_dvbapi | 3 -
config/rootfiles/packages/i586/vdr_dvbapi | 4 -
config/rootfiles/packages/vdr | 84 --
config/rootfiles/packages/vdr_eepg | 2 -
config/rootfiles/packages/vdr_epgsearch | 14 -
config/rootfiles/packages/vdr_streamdev | 8 -
config/rootfiles/packages/vdradmin | 185 ---
config/rootfiles/packages/x86_64/vdr_dvbapi | 3 -
config/vdr/etc/channels.conf | 1273 -----------------
config/vdr/etc/plugins/streamdevhosts.conf | 3 -
config/vdr/etc/setup.conf | 84 --
config/vdr/etc/svdrphosts.conf | 12 -
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 -
config/vdr/runvdr | 94 --
config/vdr/vdr.sysconfig | 39 -
config/vdradmin/install-ipfire.sh | 290 ----
config/vdradmin/vdradmind.conf | 88 --
lfs/initscripts | 3 -
lfs/strip | 6 +-
lfs/vdr | 147 --
lfs/vdr_dvbapi | 123 --
lfs/vdr_eepg | 103 --
lfs/vdr_epgsearch | 116 --
lfs/vdr_streamdev | 108 --
lfs/vdradmin | 94 --
make.sh | 6 -
src/initscripts/packages/vdr | 47 -
src/initscripts/packages/vdradmin | 48 -
src/paks/vdr/install.sh | 115 --
src/paks/vdr/uninstall.sh | 27 -
src/paks/vdr/update.sh | 36 -
src/paks/vdradmin/install.sh | 27 -
src/paks/vdradmin/uninstall.sh | 27 -
src/paks/vdradmin/update.sh | 37 -
.../vdr-epgsearch-1.0.1.beta3-paths.patch | 82 --
src/patches/vdr-streamdev_recordings-64.patch | 29 -
45 files changed, 1 insertion(+), 3412 deletions(-)
delete mode 100644 config/backup/includes/vdr
delete mode 100644 config/rootfiles/packages/armv5tel/vdr_dvbapi
delete mode 100644 config/rootfiles/packages/i586/vdr_dvbapi
delete mode 100644 config/rootfiles/packages/vdr
delete mode 100644 config/rootfiles/packages/vdr_eepg
delete mode 100644 config/rootfiles/packages/vdr_epgsearch
delete mode 100644 config/rootfiles/packages/vdr_streamdev
delete mode 100644 config/rootfiles/packages/vdradmin
delete mode 100644 config/rootfiles/packages/x86_64/vdr_dvbapi
delete mode 100644 config/vdr/etc/channels.conf
delete mode 100644 config/vdr/etc/plugins/streamdevhosts.conf
delete mode 100644 config/vdr/etc/setup.conf
delete mode 100644 config/vdr/etc/svdrphosts.conf
delete mode 100644 config/vdr/plugins.d/conflictcheckonly.conf
delete mode 100644 config/vdr/plugins.d/epgsearch.conf
delete mode 100644 config/vdr/plugins.d/epgsearchonly.conf
delete mode 100644 config/vdr/plugins.d/quickepgsearch.conf
delete mode 100644 config/vdr/plugins.d/streamdev-server.conf
delete mode 100644 config/vdr/runvdr
delete mode 100644 config/vdr/vdr.sysconfig
delete mode 100755 config/vdradmin/install-ipfire.sh
delete mode 100644 config/vdradmin/vdradmind.conf
delete mode 100644 lfs/vdr
delete mode 100644 lfs/vdr_dvbapi
delete mode 100644 lfs/vdr_eepg
delete mode 100644 lfs/vdr_epgsearch
delete mode 100644 lfs/vdr_streamdev
delete mode 100644 lfs/vdradmin
delete mode 100644 src/initscripts/packages/vdr
delete mode 100644 src/initscripts/packages/vdradmin
delete mode 100644 src/paks/vdr/install.sh
delete mode 100644 src/paks/vdr/uninstall.sh
delete mode 100644 src/paks/vdr/update.sh
delete mode 100644 src/paks/vdradmin/install.sh
delete mode 100644 src/paks/vdradmin/uninstall.sh
delete mode 100644 src/paks/vdradmin/update.sh
delete mode 100644 src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch
delete mode 100644 src/patches/vdr-streamdev_recordings-64.patch
diff --git a/config/backup/includes/vdr b/config/backup/includes/vdr
deleted file mode 100644
index a2b5d83f0..000000000
--- a/config/backup/includes/vdr
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/vdr
-/etc/sysconfig/vdr
diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index ddf098ed4..afddcb35a 100644
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -99,7 +99,6 @@ etc/rc.d/init.d/wlanclient
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion
-#etc/rc.d/rc0.d/K01vdradmin
#etc/rc.d/rc0.d/K02sslh
etc/rc.d/rc0.d/K08fcron
etc/rc.d/rc0.d/K28apache
@@ -148,11 +147,9 @@ etc/rc.d/rc3.d/S98rc.local
#etc/rc.d/rc3.d/S98sslh
#etc/rc.d/rc3.d/S99imspetor
#etc/rc.d/rc3.d/S99motion
-#etc/rc.d/rc3.d/S99vdradmin
#etc/rc.d/rc6.d
#etc/rc.d/rc6.d/K01imspetor
#etc/rc.d/rc6.d/K01motion
-#etc/rc.d/rc6.d/K01vdradmin
#etc/rc.d/rc6.d/K02sslh
etc/rc.d/rc6.d/K08fcron
etc/rc.d/rc6.d/K28apache
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index ddf098ed4..afddcb35a 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -99,7 +99,6 @@ etc/rc.d/init.d/wlanclient
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion
-#etc/rc.d/rc0.d/K01vdradmin
#etc/rc.d/rc0.d/K02sslh
etc/rc.d/rc0.d/K08fcron
etc/rc.d/rc0.d/K28apache
@@ -148,11 +147,9 @@ etc/rc.d/rc3.d/S98rc.local
#etc/rc.d/rc3.d/S98sslh
#etc/rc.d/rc3.d/S99imspetor
#etc/rc.d/rc3.d/S99motion
-#etc/rc.d/rc3.d/S99vdradmin
#etc/rc.d/rc6.d
#etc/rc.d/rc6.d/K01imspetor
#etc/rc.d/rc6.d/K01motion
-#etc/rc.d/rc6.d/K01vdradmin
#etc/rc.d/rc6.d/K02sslh
etc/rc.d/rc6.d/K08fcron
etc/rc.d/rc6.d/K28apache
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index e666ed84e..116b8cba9 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -98,7 +98,6 @@ etc/rc.d/init.d/wlanclient
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion
-#etc/rc.d/rc0.d/K01vdradmin
#etc/rc.d/rc0.d/K02sslh
etc/rc.d/rc0.d/K08fcron
etc/rc.d/rc0.d/K28apache
@@ -147,11 +146,9 @@ etc/rc.d/rc3.d/S98rc.local
#etc/rc.d/rc3.d/S98sslh
#etc/rc.d/rc3.d/S99imspetor
#etc/rc.d/rc3.d/S99motion
-#etc/rc.d/rc3.d/S99vdradmin
#etc/rc.d/rc6.d
#etc/rc.d/rc6.d/K01imspetor
#etc/rc.d/rc6.d/K01motion
-#etc/rc.d/rc6.d/K01vdradmin
#etc/rc.d/rc6.d/K02sslh
etc/rc.d/rc6.d/K08fcron
etc/rc.d/rc6.d/K28apache
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index e666ed84e..116b8cba9 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -98,7 +98,6 @@ etc/rc.d/init.d/wlanclient
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion
-#etc/rc.d/rc0.d/K01vdradmin
#etc/rc.d/rc0.d/K02sslh
etc/rc.d/rc0.d/K08fcron
etc/rc.d/rc0.d/K28apache
@@ -147,11 +146,9 @@ etc/rc.d/rc3.d/S98rc.local
#etc/rc.d/rc3.d/S98sslh
#etc/rc.d/rc3.d/S99imspetor
#etc/rc.d/rc3.d/S99motion
-#etc/rc.d/rc3.d/S99vdradmin
#etc/rc.d/rc6.d
#etc/rc.d/rc6.d/K01imspetor
#etc/rc.d/rc6.d/K01motion
-#etc/rc.d/rc6.d/K01vdradmin
#etc/rc.d/rc6.d/K02sslh
etc/rc.d/rc6.d/K08fcron
etc/rc.d/rc6.d/K28apache
diff --git a/config/rootfiles/packages/armv5tel/vdr_dvbapi b/config/rootfiles/packages/armv5tel/vdr_dvbapi
deleted file mode 100644
index 074813795..000000000
--- a/config/rootfiles/packages/armv5tel/vdr_dvbapi
+++ /dev/null
@@ -1,3 +0,0 @@
-etc/sysconfig/vdr-plugins.d/dvbapi.conf
-etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.0.0
diff --git a/config/rootfiles/packages/i586/vdr_dvbapi b/config/rootfiles/packages/i586/vdr_dvbapi
deleted file mode 100644
index 5e06c12a4..000000000
--- a/config/rootfiles/packages/i586/vdr_dvbapi
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/sysconfig/vdr-plugins.d/dvbapi.conf
-etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.0.0
-usr/lib/vdr/libvdr-dvbapi.so.2.0.0-sse
diff --git a/config/rootfiles/packages/vdr b/config/rootfiles/packages/vdr
deleted file mode 100644
index 4b6eaffe2..000000000
--- a/config/rootfiles/packages/vdr
+++ /dev/null
@@ -1,84 +0,0 @@
-etc/rc.d/init.d/vdr
-etc/rc.d/rc0.d/K40vdr
-etc/rc.d/rc3.d/S60vdr
-etc/rc.d/rc6.d/K40vdr
-etc/sysconfig/vdr
-#etc/sysconfig/vdr-plugins.d
-etc/vdr
-etc/vdr/channels.conf
-etc/vdr/diseqc.conf
-etc/vdr/keymacros.conf
-etc/vdr/scr.conf
-etc/vdr/sources.conf
-etc/vdr/svdrphosts.conf
-usr/bin/svdrpsend
-#usr/include/libsi
-#usr/include/libsi/descriptor.h
-#usr/include/libsi/headers.h
-#usr/include/libsi/section.h
-#usr/include/libsi/si.h
-#usr/include/libsi/util.h
-#usr/include/vdr
-#usr/include/vdr/audio.h
-#usr/include/vdr/channels.h
-#usr/include/vdr/ci.h
-#usr/include/vdr/config.h
-#usr/include/vdr/cutter.h
-#usr/include/vdr/device.h
-#usr/include/vdr/diseqc.h
-#usr/include/vdr/dvbci.h
-#usr/include/vdr/dvbdevice.h
-#usr/include/vdr/dvbplayer.h
-#usr/include/vdr/dvbspu.h
-#usr/include/vdr/dvbsubtitle.h
-#usr/include/vdr/eit.h
-#usr/include/vdr/eitscan.h
-#usr/include/vdr/epg.h
-#usr/include/vdr/filter.h
-#usr/include/vdr/font.h
-#usr/include/vdr/i18n.h
-#usr/include/vdr/interface.h
-#usr/include/vdr/keys.h
-#usr/include/vdr/lirc.h
-#usr/include/vdr/menu.h
-#usr/include/vdr/menuitems.h
-#usr/include/vdr/nit.h
-#usr/include/vdr/osd.h
-#usr/include/vdr/osdbase.h
-#usr/include/vdr/pat.h
-#usr/include/vdr/player.h
-#usr/include/vdr/plugin.h
-#usr/include/vdr/receiver.h
-#usr/include/vdr/recorder.h
-#usr/include/vdr/recording.h
-#usr/include/vdr/remote.h
-#usr/include/vdr/remux.h
-#usr/include/vdr/ringbuffer.h
-#usr/include/vdr/sdt.h
-#usr/include/vdr/sections.h
-#usr/include/vdr/shutdown.h
-#usr/include/vdr/skinclassic.h
-#usr/include/vdr/skinlcars.h
-#usr/include/vdr/skins.h
-#usr/include/vdr/skinsttng.h
-#usr/include/vdr/sourceparams.h
-#usr/include/vdr/sources.h
-#usr/include/vdr/spu.h
-#usr/include/vdr/status.h
-#usr/include/vdr/svdrp.h
-#usr/include/vdr/themes.h
-#usr/include/vdr/thread.h
-#usr/include/vdr/timers.h
-#usr/include/vdr/tools.h
-#usr/include/vdr/transfer.h
-#usr/include/vdr/videodir.h
-#usr/lib/vdr
-#usr/lib/vdr/Make.global
-#usr/lib/vdr/config.h
-#usr/lib/vdr/device.h
-usr/sbin/runvdr
-usr/sbin/vdr
-usr/share/vdr
-var/cache/vdr
-var/ipfire/backup/addons/includes/vdr
-#var/video
diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/vdr_eepg
deleted file mode 100644
index 17f7bc4af..000000000
--- a/config/rootfiles/packages/vdr_eepg
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/vdr/plugins/eepg
-usr/lib/vdr/libvdr-eepg.so.2.0.0
diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch
deleted file mode 100644
index 193d79f9c..000000000
--- a/config/rootfiles/packages/vdr_epgsearch
+++ /dev/null
@@ -1,14 +0,0 @@
-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.2.0.0
-usr/lib/vdr/libvdr-epgsearch.so.2.0.0
-usr/lib/vdr/libvdr-epgsearchonly.so.2.0.0
-usr/lib/vdr/libvdr-quickepgsearch.so.2.0.0
-#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
deleted file mode 100644
index 458e7d810..000000000
--- a/config/rootfiles/packages/vdr_streamdev
+++ /dev/null
@@ -1,8 +0,0 @@
-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.2.0.0
diff --git a/config/rootfiles/packages/vdradmin b/config/rootfiles/packages/vdradmin
deleted file mode 100644
index 3dba2a03c..000000000
--- a/config/rootfiles/packages/vdradmin
+++ /dev/null
@@ -1,185 +0,0 @@
-#etc/vdradmin
-etc/vdradmin/vdradmind.conf
-usr/bin/vdradmind
-#usr/share/doc/vdradmin
-#usr/share/doc/vdradmin/COPYING
-#usr/share/doc/vdradmin/CREDITS
-#usr/share/doc/vdradmin/FAQ
-#usr/share/doc/vdradmin/HISTORY
-#usr/share/doc/vdradmin/INSTALL
-#usr/share/doc/vdradmin/LGPL.txt
-#usr/share/doc/vdradmin/README
-#usr/share/doc/vdradmin/README.translators
-#usr/share/doc/vdradmin/REQUIREMENTS
-#usr/share/doc/vdradmin/contrib
-#usr/share/doc/vdradmin/contrib/HISTORY
-#usr/share/doc/vdradmin/contrib/HISTORY.bigpatch
-#usr/share/doc/vdradmin/contrib/HISTORY.ct
-#usr/share/doc/vdradmin/contrib/HISTORY.macfly
-#usr/share/doc/vdradmin/contrib/README.Streaming
-#usr/share/doc/vdradmin/contrib/user.css.example
-#usr/share/doc/vdradmin/contrib/vdradmind.bl_example
-#usr/share/locale/cs/LC_MESSAGES/vdradmin.mo
-usr/share/locale/de/LC_MESSAGES/vdradmin.mo
-#usr/share/locale/es/LC_MESSAGES/vdradmin.mo
-#usr/share/locale/fi/LC_MESSAGES/vdradmin.mo
-#usr/share/locale/fr/LC_MESSAGES/vdradmin.mo
-#usr/share/locale/it/LC_MESSAGES/vdradmin.mo
-#usr/share/locale/nl/LC_MESSAGES/vdradmin.mo
-#usr/share/locale/ru/LC_MESSAGES/vdradmin.mo
-#usr/share/man/man1/vdradmind.1
-usr/share/vdradmin
-#usr/share/vdradmin/lib
-#usr/share/vdradmin/lib/File
-#usr/share/vdradmin/lib/File/Temp.pm
-#usr/share/vdradmin/lib/MIME
-#usr/share/vdradmin/lib/MIME/Base64.pm
-#usr/share/vdradmin/lib/Template
-#usr/share/vdradmin/lib/Template.pm
-#usr/share/vdradmin/lib/Template/Base.pm
-#usr/share/vdradmin/lib/Template/Config.pm
-#usr/share/vdradmin/lib/Template/Constants.pm
-#usr/share/vdradmin/lib/Template/Context.pm
-#usr/share/vdradmin/lib/Template/Directive.pm
-#usr/share/vdradmin/lib/Template/Document.pm
-#usr/share/vdradmin/lib/Template/Exception.pm
-#usr/share/vdradmin/lib/Template/Filters.pm
-#usr/share/vdradmin/lib/Template/Grammar.pm
-#usr/share/vdradmin/lib/Template/Iterator.pm
-#usr/share/vdradmin/lib/Template/Namespace
-#usr/share/vdradmin/lib/Template/Namespace/Constants.pm
-#usr/share/vdradmin/lib/Template/Parser.pm
-#usr/share/vdradmin/lib/Template/Plugin
-#usr/share/vdradmin/lib/Template/Plugin.pm
-#usr/share/vdradmin/lib/Template/Plugin/Date.pm
-#usr/share/vdradmin/lib/Template/Plugin/HTML.pm
-#usr/share/vdradmin/lib/Template/Plugin/JavaScript.pm
-#usr/share/vdradmin/lib/Template/Plugins.pm
-#usr/share/vdradmin/lib/Template/Provider.pm
-#usr/share/vdradmin/lib/Template/Service.pm
-#usr/share/vdradmin/lib/Template/Stash
-#usr/share/vdradmin/lib/Template/Stash.pm
-#usr/share/vdradmin/lib/Template/Stash/Context.pm
-#usr/share/vdradmin/lib/Template/Stash/XS.pm
-#usr/share/vdradmin/lib/Template/Test.pm
-#usr/share/vdradmin/lib/Template/View.pm
-#usr/share/vdradmin/lib/URI
-#usr/share/vdradmin/lib/URI/Escape.pm
-#usr/share/vdradmin/template
-#usr/share/vdradmin/template/default
-#usr/share/vdradmin/template/default/about.html
-#usr/share/vdradmin/template/default/at_timer_list.html
-#usr/share/vdradmin/template/default/at_timer_new.html
-#usr/share/vdradmin/template/default/config.html
-#usr/share/vdradmin/template/default/default
-#usr/share/vdradmin/template/default/default/aktion.png
-#usr/share/vdradmin/template/default/default/close.png
-#usr/share/vdradmin/template/default/default/configure.png
-#usr/share/vdradmin/template/default/default/cut.png
-#usr/share/vdradmin/template/default/default/delete.png
-#usr/share/vdradmin/template/default/default/edit.png
-#usr/share/vdradmin/template/default/default/fern_03.jpg
-#usr/share/vdradmin/template/default/default/fern_05.jpg
-#usr/share/vdradmin/template/default/default/fern_06.jpg
-#usr/share/vdradmin/template/default/default/fern_07.jpg
-#usr/share/vdradmin/template/default/default/fern_08.jpg
-#usr/share/vdradmin/template/default/default/fern_09.jpg
-#usr/share/vdradmin/template/default/default/fern_10.jpg
-#usr/share/vdradmin/template/default/default/fern_11.jpg
-#usr/share/vdradmin/template/default/default/fern_12.jpg
-#usr/share/vdradmin/template/default/default/fern_13.jpg
-#usr/share/vdradmin/template/default/default/fern_15.jpg
-#usr/share/vdradmin/template/default/default/fern_18.jpg
-#usr/share/vdradmin/template/default/default/fern_19.jpg
-#usr/share/vdradmin/template/default/default/fern_22.jpg
-#usr/share/vdradmin/template/default/default/fern_23.jpg
-#usr/share/vdradmin/template/default/default/fern_24.jpg
-#usr/share/vdradmin/template/default/default/fern_25.jpg
-#usr/share/vdradmin/template/default/default/fern_28.jpg
-#usr/share/vdradmin/template/default/default/fern_31.jpg
-#usr/share/vdradmin/template/default/default/fern_32.jpg
-#usr/share/vdradmin/template/default/default/fern_33.jpg
-#usr/share/vdradmin/template/default/default/fern_36.jpg
-#usr/share/vdradmin/template/default/default/fern_39.jpg
-#usr/share/vdradmin/template/default/default/fern_40.jpg
-#usr/share/vdradmin/template/default/default/fern_41.jpg
-#usr/share/vdradmin/template/default/default/fern_42.jpg
-#usr/share/vdradmin/template/default/default/fern_43.jpg
-#usr/share/vdradmin/template/default/default/fern_44.jpg
-#usr/share/vdradmin/template/default/default/fern_45.jpg
-#usr/share/vdradmin/template/default/default/fern_46.jpg
-#usr/share/vdradmin/template/default/default/fern_47.jpg
-#usr/share/vdradmin/template/default/default/fern_48.jpg
-#usr/share/vdradmin/template/default/default/fern_back.jpg
-#usr/share/vdradmin/template/default/default/fern_mute.jpg
-#usr/share/vdradmin/template/default/default/find.png
-#usr/share/vdradmin/template/default/default/folder_video.png
-#usr/share/vdradmin/template/default/default/help.png
-#usr/share/vdradmin/template/default/default/imdb.png
-#usr/share/vdradmin/template/default/default/info_button.png
-#usr/share/vdradmin/template/default/default/info_button_disabled.png
-#usr/share/vdradmin/template/default/default/logo.png
-#usr/share/vdradmin/template/default/default/noise.gif
-#usr/share/vdradmin/template/default/default/pfeile_nachlinks.png
-#usr/share/vdradmin/template/default/default/pfeile_nachlinks_soft.png
-#usr/share/vdradmin/template/default/default/pfeile_nachrechts.png
-#usr/share/vdradmin/template/default/default/pfeile_nachrechts_soft.png
-#usr/share/vdradmin/template/default/default/play.png
-#usr/share/vdradmin/template/default/default/poempl_gelb.png
-#usr/share/vdradmin/template/default/default/poempl_grau.png
-#usr/share/vdradmin/template/default/default/poempl_gruen.png
-#usr/share/vdradmin/template/default/default/poempl_rot.png
-#usr/share/vdradmin/template/default/default/rec.gif
-#usr/share/vdradmin/template/default/default/rec_button.png
-#usr/share/vdradmin/template/default/default/sortiert_asc.gif
-#usr/share/vdradmin/template/default/default/sortiert_desc.gif
-#usr/share/vdradmin/template/default/default/spacer.gif
-#usr/share/vdradmin/template/default/default/stream.png
-#usr/share/vdradmin/template/default/default/sum_find.png
-#usr/share/vdradmin/template/default/default/tv_bottom.gif
-#usr/share/vdradmin/template/default/default/udef_search.png
-#usr/share/vdradmin/template/default/default/view.png
-#usr/share/vdradmin/template/default/epgsearch_config.html
-#usr/share/vdradmin/template/default/epgsearch_list.html
-#usr/share/vdradmin/template/default/epgsearch_new.html
-#usr/share/vdradmin/template/default/error.html
-#usr/share/vdradmin/template/default/favicon.ico
-#usr/share/vdradmin/template/default/help_at_timer_list.html
-#usr/share/vdradmin/template/default/help_at_timer_new.html
-#usr/share/vdradmin/template/default/help_config.html
-#usr/share/vdradmin/template/default/help_edit_epg.html
-#usr/share/vdradmin/template/default/help_no.html
-#usr/share/vdradmin/template/default/help_rec_list.html
-#usr/share/vdradmin/template/default/help_timer_list.html
-#usr/share/vdradmin/template/default/help_timer_new.html
-#usr/share/vdradmin/template/default/index.html
-#usr/share/vdradmin/template/default/infobox.js
-#usr/share/vdradmin/template/default/library.js
-#usr/share/vdradmin/template/default/navigation.html
-#usr/share/vdradmin/template/default/noauth.html
-#usr/share/vdradmin/template/default/noperm.html
-#usr/share/vdradmin/template/default/prog_detail.html
-#usr/share/vdradmin/template/default/prog_detail_form.html
-#usr/share/vdradmin/template/default/prog_list.html
-#usr/share/vdradmin/template/default/prog_list2.html
-#usr/share/vdradmin/template/default/prog_summary.html
-#usr/share/vdradmin/template/default/prog_summary2.html
-#usr/share/vdradmin/template/default/prog_timeline.html
-#usr/share/vdradmin/template/default/rc.html
-#usr/share/vdradmin/template/default/rec_edit.html
-#usr/share/vdradmin/template/default/rec_list.html
-#usr/share/vdradmin/template/default/style.css
-#usr/share/vdradmin/template/default/timeline.js
-#usr/share/vdradmin/template/default/timer_list.html
-#usr/share/vdradmin/template/default/timer_new.html
-#usr/share/vdradmin/template/default/tv.html
-#usr/share/vdradmin/template/default/vdr_cmds.html
-etc/rc.d/init.d/vdradmin
-etc/rc.d/rc0.d/K01vdradmin
-etc/rc.d/rc6.d/K01vdradmin
-etc/rc.d/rc3.d/S99vdradmin
-#usr/share/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo
-#usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo
-var/cache/vdradmin
-var/log/vdradmin
-#var/run/vdradmin
diff --git a/config/rootfiles/packages/x86_64/vdr_dvbapi b/config/rootfiles/packages/x86_64/vdr_dvbapi
deleted file mode 100644
index 074813795..000000000
--- a/config/rootfiles/packages/x86_64/vdr_dvbapi
+++ /dev/null
@@ -1,3 +0,0 @@
-etc/sysconfig/vdr-plugins.d/dvbapi.conf
-etc/vdr/plugins/dvbapi
-usr/lib/vdr/libvdr-dvbapi.so.2.0.0
diff --git a/config/vdr/etc/channels.conf b/config/vdr/etc/channels.conf
deleted file mode 100644
index 8676a27a2..000000000
--- a/config/vdr/etc/channels.conf
+++ /dev/null
@@ -1,1273 +0,0 @@
-:->Hauptkanaele
-Das Erste;ARD:11837:hC34:S19.2E:27500:101:102=deu,103=2ch;106=dd:104:0:28106:1:1101:0
-ZDF;ZDFvision:11954:hC34:S19.2E:27500:110:120=deu,121=2ch;125=dd:130:0:28006:1:1079:0
-WDR Bonn;ARD:12604:hC56:S19.2E:22000:0:0:0:0:28536:1:1111:0
-RTL Television,RTL;RTL World:12188:hC34:S19.2E:27500:163:104=deu;106=deu:105:0:12003:1:1089:0
-SAT.1;ProSiebenSat.1:12545:hC56:S19.2E:22000:255:256=deu;259=deu:32:0:17500:1:1107:0
-ProSieben;ProSiebenSat.1:12545:hC56:S19.2E:22000:511:512=deu;515=deu:33:0:17501:1:1107:0
-RTL2;RTL World:12188:hC34:S19.2E:27500:166:128=deu:68:0:12020:1:1089:0
-kabel eins;ProSiebenSat.1:12545:hC56:S19.2E:22000:767:768=deu:34:0:17502:1:1107:0
-VOX;RTL World:12188:hC34:S19.2E:27500:167:136=deu:71:0:12060:1:1089:0
-ORF1;ORF:12692:hC56:S19.2E:22000:160:161=deu;163=deu:165:1762,D05,1801,1702:13001:1:1117:0
-ORF2;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13002:1:1117:0
-ATV+;ATV+:12692:hC56:S19.2E:22000:506:507=deu:509:1762,D05,1801,1702:13012:1:1117:0
-3sat;ZDFvision:11954:hC34:S19.2E:27500:210:220=deu,221=2ch;225=dd:230:0:28007:1:1079:0
-TELE 5;BetaDigital:12480:vC34:S19.2E:27500:1535:1536=deu:38:0:51:133:33:0
-DAS VIERTE,D VIERTE;BetaDigital:12460:hC34:S19.2E:27500:2047:2048=deu:36:0:1793:133:5:0
-DMAX;BetaDigital:12246:vC34:S19.2E:27500:511:512=deu:32:0:10101:1:1092:0
-:->Kinderprogramme
-KiKa;ZDFvision:11954:hC34:S19.2E:27500:310:320=deu:330:0:28008:1:1079:0
-Super RTL,S RTL;RTL World:12188:hC34:S19.2E:27500:165:120=deu:65:0:12040:1:1089:0
-TEDDY;BetaDigital:12246:vC34:S19.2E:27500:0:368=deu:0:0:10142:1:1092:0
-:->ARD
-EinsExtra;ARD:10744:hC56:S19.2E:22000:101:102=deu:0:0:28721:1:1051:0
-EinsFestival;ARD:10744:hC56:S19.2E:22000:201:202=deu:204:0:28722:1:1051:0
-EinsPlus;ARD:10744:hC56:S19.2E:22000:301:302=deu:304:0:28723:1:1051:0
-BR-alpha;ARD:12265:hC34:S19.2E:27500:1401:0:0:0:28487:1:1093:0
-NDR FS NDS;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28226:1:1073:0
-MDR FERNSEHEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28204:1:1073:0
-rbb Berlin;ARD:12109:hC34:S19.2E:27500:601:602=deu:604:0:28206:1:1073:0
-hr-fernsehen;ARD:11837:hC34:S19.2E:27500:301:302=deu:304:0:28108:1:1101:0
-ARD-Online-Kanal;ARD:12109:hC34:S19.2E:27500:0:0:0:0:28218:1:1073:0
-ARD-TEST-1;ARD:12109:hC34:S19.2E:27500:0:0:0:0:28221:1:1073:0
-ARD-TEST-2;ARD:12109:hC34:S19.2E:27500:101:102=deu:0:0:28222:1:1073:0
-arte-alt;ARD:11837:hC34:S19.2E:27500:401:402=deu,403=fra:404:0:28109:1:1101:0
-arte;ARD:10744:hC56:S19.2E:22000:401:402=deu,403=fra:404:0:28724:1:1051:0
-Bayerisches FS Nord;ARD:11837:hC34:S19.2E:27500:501:0:0:0:28110:1:1101:0
-Bayerisches FS S�d;ARD:11837:hC34:S19.2E:27500:201:202=deu,203=2ch:204:0:28107:1:1101:0
-BR-alpha*;ARD:11837:hC34:S19.2E:27500:701:702=deu:704:0:28112:1:1101:0
-EinsExtra-alt;ARD:12109:hC34:S19.2E:27500:101:102=deu:0:0:28201:1:1073:0
-EinsFestival-alt;ARD:12109:hC34:S19.2E:27500:201:202=deu:204:0:28202:1:1073:0
-EinsPlus-alt;ARD:12109:hC34:S19.2E:27500:301:302=deu:0:0:28203:1:1073:0
-MDR S-ANHALT+;ARD:12421:hC34:S19.2E:27500:2901:2902=deu:2903:0:28329:1:1201:0
-MDR S-ANHALT;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28229:1:1073:0
-MDR TH�RINGEN+;ARD:12421:hC34:S19.2E:27500:2901:2902=deu:2903:0:28330:1:1201:0
-MDR TH�RINGEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28230:1:1073:0
-NDR FS HH+;ARD:12421:hC34:S19.2E:27500:2701:2702=deu:2704:0:28325:1:1201:0
-NDR FS HH;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28225:1:1073:0
-NDR FS MV+;ARD:12421:hC34:S19.2E:27500:2701:2702=deu:2704:0:28326:1:1201:0
-NDR FS MV;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28224:1:1073:0
-NDR FS SH+;ARD:12421:hC34:S19.2E:27500:2701:2702=deu:2704:0:28327:1:1201:0
-NDR FS SH;ARD:12109:hC34:S19.2E:27500:2401:2402=deu:2404:0:28227:1:1073:0
-Phoenix-alt;ARD:11837:hC34:S19.2E:27500:901:902=deu:904:0:28114:1:1101:0
-Phoenix;ARD:10744:hC56:S19.2E:22000:501:502=deu:504:0:28725:1:1051:0
-Radio Bremen TV*;ARD:12265:hC34:S19.2E:27500:1201:1202=deu:1204:0:28485:1:1093:0
-Radio Bremen TV;ARD:12421:hC34:S19.2E:27500:1201:0:0:0:28385:1:1201:0
-rbb Brandenburg;ARD:12109:hC34:S19.2E:27500:501:502=deu:504:0:28205:1:1073:0
-SR Fernsehen;ARD:12265:hC34:S19.2E:27500:1301:1302=deu:1304:0:28486:1:1093:0
-SWR Fernsehen BW;ARD:11837:hC34:S19.2E:27500:801:802=deu:804:0:28113:1:1101:0
-SWR Fernsehen RP;ARD:12109:hC34:S19.2E:27500:3101:3102=deu:3104:0:28231:1:1073:0
-Test-R;ARD:11837:hC34:S19.2E:27500:201:202:204:0:28130:1:1101:0
-WDR Aachen;ARD:12604:hC56:S19.2E:22000:3301:3302=ger:3304:0:28534:1:1111:0
-WDR Bielefeld;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28306:1:1201:0
-WDR Dortmund;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28307:1:1201:0
-WDR Duisburg;ARD:12604:hC56:S19.2E:22000:3301:3302=ger:3304:0:28537:1:1111:0
-WDR D�sseldorf;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28308:1:1201:0
-WDR Essen;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28309:1:1201:0
-WDR K�ln;ARD:11837:hC34:S19.2E:27500:601:602=deu:604:0:28111:1:1101:0
-WDR M�nster;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28310:1:1201:0
-WDR Siegen;ARD:12421:hC34:S19.2E:27500:101:102=deu:104:0:28311:1:1201:0
-WDR Test A;ARD:12421:hC34:S19.2E:27500:101:102=deu,103=deu;106=deu:104:0:28395:1:1201:0
-WDR Wuppertal;ARD:12604:hC56:S19.2E:22000:3301:3302=ger:3304:0:28535:1:1111:0
-:->ZDFvision
-ZDFdokukanal;ZDFvision:11954:hC34:S19.2E:27500:660:670=deu,671=2ch:630:0:28014:1:1079:0
-ZDFinfokanal;ZDFvision:11954:hC34:S19.2E:27500:610:620=deu:630:0:28011:1:1079:0
-ZDFtheaterkanal;ZDFvision:11954:hC34:S19.2E:27500:1110:1120=deu:630:0:28016:1:1079:0
-:->Radiostations
-SWR3;ARD SWR:12265:hC34:S19.2E:27500:0:1031=deu:0:0:28468:1:1093:0
-Bayern 3;ARD BR:12265:hC34:S19.2E:27500:0:121=deu:0:0:28402:1:1093:0
-hr3;ARD HR:12265:hC34:S19.2E:27500:0:421=deu:0:0:28421:1:1093:0
-N-JOY;ARD NDR:12265:hC34:S19.2E:27500:0:631=deu:0:0:28440:1:1093:0
-sunshine live,sunshine;BetaDigital:12148:hC34:S19.2E:27500:0:336=deu:0:0:169:133:7:0
-ANTENNE BAYERN,ANTENNE;BetaDigital:12148:hC34:S19.2E:27500:0:352=deu:0:0:170:133:7:0
-Das Modul;ARD BR:12265:hC34:S19.2E:27500:0:161=deu:0:0:28406:1:1093:0
-Fritz;ARD rbb:12265:hC34:S19.2E:27500:0:851=deu:0:0:28457:1:1093:0
-:->News
-n-tv;RTL World:12188:hC34:S19.2E:27500:169:73=deu:80:0:12090:1:1089:0
-N24;ProSiebenSat.1:12545:hC56:S19.2E:22000:1023:1024=deu:35:0:17503:1:1107:0
-Russia Today;OVERON:11538:vC56:S19.2E:22000:604:624:0:0:6904:1:1022:0
-France 24 (en Francais);FRANCE 24:11538:vC56:S19.2E:22000:605:625:0:0:6905:1:1022:0
-France 24 (in English);FRANCE 24:11538:vC56:S19.2E:22000:606:626:0:0:6906:1:1022:0
-CNBC Europe;CNBC:11597:vC56:S19.2E:22000:307:308=eng:43:0:10030:1:1026:0
-BBC World;BBC:11597:vC56:S19.2E:22000:163:92=eng:41:0:10050:1:1026:0
-Sky News;BT:11597:vC56:S19.2E:22000:305+131:306=eng:579:0:28707:1:1026:0
-CNN+;CNN+:11686:vC56:S19.2E:22000:169:116=esl:59:100,1810:30210:1:1032:0
-CNN Int.;CNN:11778:vC34:S19.2E:27500:165:100=eng:47:0:28522:1:1068:0
-EURONEWS;CSAT:11817:vC34:S19.2E:27500:163:92=fra,93=eng,94=ita,95=esl,91=rus,98=por,99=deu:0:0:8004:1:1070:0
-EuroNews;Globecast:12226:hC34:S19.2E:27500:2432:2433=deu,2434=eng,2435=fra,2436=ita,2437=esl,2438=por,2439=rus,2440=und:0:0:31220:1:1091:0
-AL JAZEERA ENG;GCE:11509:vC56:S19.2E:22000:712:732:0:0:7012:1:1020:0
-Al Jazeera;CANALSATELLITE:11568:vC56:S19.2E:22000:55:56=ara:0:0:9021:1:1024:0
-FOX NEWS;FOXNWS:10877:vC56:S19.2E:22000:168:112=eng:0:100,1810:30611:1:1060:0
-CNN+;CNN+:11686:vC56:S19.2E:22000:169:116=esl:59:100,1810:30207:1:1032:0
-:->Deutsche Welle TV
-DW-TV;Deutsche Telekom AG:11597:vC56:S19.2E:22000:1000:1001:1003:0:10020:1:1026:0
-:->Music
-imusic TV;BetaDigital:12460:hC34:S19.2E:27500:495:496=deu:0:0:772:133:5:0
-GoTV;GoTV:12663:hC56:S19.2E:22000:1020:1021=deu:179:0:13102:1:1115:0
-DELUXE MUSIC,DELUXE;BetaDigital:12246:vC34:S19.2E:27500:255:256=deu:0:0:10100:1:1092:0
-Ocko TV;OCKO TV:10832:hC56:S19.2E:22000:161:162:0:0:61990:1:1057:0
-NRJ Hits;GlobeCast:11538:vC56:S19.2E:22000:608:628=fra:0:0:6908:1:1022:0
-MTV Base France;MTV Networks Europe:11739:vC34:S19.2E:27500:3111+8190:3112:0:D00,100,500:28661:1:1066:0
-VH1 Classic.;MTV Networks Europe:11739:vC34:S19.2E:27500:3071+8190:3072:0:D00,100,500:28667:1:1066:0
-MTV Germany;MTV Networks Europe:11973:vC34:S19.2E:27500:4031+8190:4032:4034:0:28673:1:1078:0
-MTV AUSTRIA;MTV Networks:12226:hC34:S19.2E:27500:515:662=deu:578:0:28641:1:1091:0
-1A Volksmusik.tv;T-Systems:12633:hC56:S19.2E:22000:233:333=deu:0:0:12633:1:1113:0
-MTV Hungary,MTV Hungary;UPC Direct:11671:hC56:S19.2E:22000:201:212=eng:220:D02,1815,D00:20356:1:1031:0
-MTV ESP;MTV Networks Europe:11739:vC34:S19.2E:27500:3011+8190:3012:3014:100,D00,1810:28651:1:1066:0
-MTV France;MTV Networks Europe:11739:vC34:S19.2E:27500:3021+8190:3022=fra:3024:D00,100,500:28652:1:1066:0
-MTV Hits;MTV Networks Europe:11739:vC34:S19.2E:27500:3041+8190:3042:0:100,B00,500,D00,D02,1815,D22:28654:1:1066:0
-MTV Dance;MTV Networks Europe:11739:vC34:S19.2E:27500:3051+8190:3052:0:100,B00,500,D00,D02,1815,D22:28655:1:1066:0
-VH1;MTV Networks Europe:11739:vC34:S19.2E:27500:3061+8190:3062:0:B00,100,500,D00,D02,1815,1810:28656:1:1066:0
-VH1 Classic;MTV Networks Europe:11739:vC34:S19.2E:27500:3071+8190:3072:0:100,500,B00,D00,D02,1815,D22:28657:1:1066:0
-MTV TWO;MTV Networks Europe:11739:vC34:S19.2E:27500:3091+8190:3092:0:100,D00,B00,500,D02,1815:28659:1:1066:0
-MTV Hits.;MTV Networks Europe:11739:vC34:S19.2E:27500:3041+8190:3042:0:100,D00,500,D02:28664:1:1066:0
-VH1.;MTV Networks Europe:11739:vC34:S19.2E:27500:3061+8190:3062:0:B00,100,500,D00,D02:28666:1:1066:0
-MTV TWO.;MTV Networks Europe:11739:vC34:S19.2E:27500:3091+8190:3092:0:100,D00,500,D02:28669:1:1066:0
-MCM;CSAT:11895:vC34:S19.2E:27500:161:84=fra:0:500,100:8352:1:1074:0
-MCM POP;CSAT:11895:vC34:S19.2E:27500:164:96=fra:0:500,100:8354:1:1074:0
-MCM TOP;CSAT:11895:vC34:S19.2E:27500:162:88=fra:0:500,100:8365:1:1074:0
-MTV Music;MTV Networks Europe:11973:vC34:S19.2E:27500:4011+8190:4012:0:100,1702,B00,D00,1830,1801:28671:1:1078:0
-MTV Euro;MTV Networks Europe:11973:vC34:S19.2E:27500:4021+8190:4022:4024:D00,D02,1815:28672:1:1078:0
-MTV Pulse;MTV Networks Europe:11973:vC34:S19.2E:27500:4041+8190:4042=fra:0:D00,100,500:28674:1:1078:0
-MTV Idol;MTV Networks Europe:11973:vC34:S19.2E:27500:4051+8190:4052=fra:0:D00,100,500:28675:1:1078:0
-MTV NL;MTV Networks Europe:11973:vC34:S19.2E:27500:4091+8190:4092:4094:100,D00:28679:1:1078:0
-MTV ENTERTAINMENT (P);MTV Networks Europe:11973:vC34:S19.2E:27500:4111+8190:4112:0:D00,1702,1801,1830:28681:1:1078:0
-HIT24;PREMIERE:12070:hC34:S19.2E:27500:1023:1024=deu:32:1702,1831,1722,1830,B00,D05,1801:168:133:1:0
-M6 MUSIC HITS;CSAT:12090:vC34:S19.2E:27500:166:104=fra:0:500,100:9407:1:1084:0
-TMF;CANALDIGITAAL:12574:hC56:S19.2E:22000:516+8190:88=dut:34:622,100:5015:53:1109:0
-:->Sport
-DSF;BetaDigital:12480:vC34:S19.2E:27500:1023:1024=deu:39:0:900:133:33:0
-EUROSPORT;ESP:10979:vC56:S19.2E:22000:168:112=esl,113=eng:0:100,1810:30680:1:1034:0
-Eurosport;SES Astra:12226:hC34:S19.2E:27500:101:103=deu:102:0:31200:1:1091:0
-NASN (P);PREMIERE:12663:hC56:S19.2E:22000:1090:1091:0:1702,1801,1830,D22:13105:1:1115:0
-TVP Sport;Telewizja Polska SA:10862:hC56:S19.2E:22000:516+8190:690=pol:0:9D0:7105:1:1059:0
-SPORTMAN�A;SPM:11038:vC56:S19.2E:22000:164:96=esl:0:100,1810:30404:1:1038:0
-Sport Klub,Sport Klub;UPC Direct:11671:hC56:S19.2E:22000:451:460=hun:470:D02,1815:20361:1:1031:0
-Sport 1 CZE,Sport 1 CZE;UPC Direct:11671:hC56:S19.2E:22000:601:611=cze:620:D02,1815:20364:1:1031:0
-PREMIERE SPORT PORTAL,SPORT PORTAL;PREMIERE:11720:hC34:S19.2E:27500:255:256=deu,257=deu;259=deu:32:1831,1830,1702,1722,1801:17:133:3:0
-SPORT+;CSAT:11817:vC34:S19.2E:27500:168:112=fra:0:500,100:8009:1:1070:0
-CANAL+ SPORT;CSAT:11856:vC34:S19.2E:27500:167:108=fra,109=eng:53:500,100:8208:1:1072:0
-sportdigital.tv,sd.tv;BetaDigital:11876:hC34:S19.2E:27500:2559:2560:0:1830:69:133:9:0
-EUROSPORT;CSAT:11934:vC34:S19.2E:27500:160:80=fra:0:500,100:8151:1:1076:0
-Sport 1,Sport 1;UPC Direct:11992:hC34:S19.2E:27500:551:560=hun:570:D02,1815:20336:1:1279:0
-Sport 2,Sport 2;UPC Direct:11992:hC34:S19.2E:27500:701:710=hun:720:D02,1815:20339:1:1279:0
-ESPN CLASSIC;CSAT:12012:vC34:S19.2E:27500:169:116=fra:0:500,100:8813:1:1080:0
-INFOSPORT;CSAT:12090:vC34:S19.2E:27500:163:92=fra:0:500,100:9404:1:1084:0
-EUROSPORT 2;CSAT:12168:vC34:S19.2E:27500:162:88=fra:0:500,100:9503:1:1088:0
-EXTREME SPORTS;CSAT:12168:vC34:S19.2E:27500:167:108=fra:0:500,100:9508:1:1088:0
-Galaxie Sport,GalSport;UPC Direct:12304:hC34:S19.2E:27500:101:111=cze:0:D02,1815:20301:1:1095:0
-Extreme Sports,ExSports;UPC Direct:12304:hC34:S19.2E:27500:601:610=hun,612=eng:620:D02,622,1815,100:20311:1:1095:0
-EUROSPORT;CANALDIGITAAL:12344:hC34:S19.2E:27500:517+8190:112=dut,113=eng,114=cze,115=hun:36:622,D02,1815,100:2025:53:1097:0
-CT4 Sport,CT4 Sport;UPC Direct:12382:hC34:S19.2E:27500:651:661=cze:670:D02,1815:20326:1:1099:0
-Eurosport 2,Eurosport 2;UPC Direct:12382:hC34:S19.2E:27500:701:712=eng:0:D02,1815:20366:1:1099:0
-EuroSport 2;arena:12441:vC34:S19.2E:27500:2050:2051=deu:0:D22:13205:1:1102:0
-Sport1;CANALDIGITAAL:12515:hC56:S19.2E:22000:513+8190:84=dut:32:622,100:4006:53:1105:0
-NASN;arena:12663:hC56:S19.2E:22000:1090:1091:0:100,D22,1702,1801,1830,D02,1815:13109:1:1115:0
-:->Radiostations2
-DKULTUR;ZDFvision:11954:hC34:S19.2E:27500:0:710=deu:0:0:28012:1:1079:0
-DLF;ZDFvision:11954:hC34:S19.2E:27500:0:810=deu:0:0:28013:1:1079:0
-ROCK ANTENNE,ROCK ANT;BetaDigital:12148:hC34:S19.2E:27500:0:304=deu:0:0:160:133:7:0
-HIT RADIO FFH;T-Systems:12633:hC56:S19.2E:22000:0:1024=deu:0:0:12660:1:1113:0
-planet radio;T-Systems:12633:hC56:S19.2E:22000:0:1030=deu:0:0:12661:1:1113:0
-OE3;ORF:12663:hC56:S19.2E:22000:0:433=deu:0:0:13133:1:1115:0
-DELUXE RADIO;BetaDigital:12246:vC34:S19.2E:27500:0:336=deu:0:0:10140:1:1092:0
-Inselradio;T-Systems:12633:hC56:S19.2E:22000:0:702:0:0:12651:1:1113:0
-radio top40;T-Systems:12633:hC56:S19.2E:22000:0:353=deu:0:0:12653:1:1113:0
-ERF Radio,ERF;BetaDigital:12148:hC34:S19.2E:27500:0:320=deu:0:0:161:133:7:0
-2255 Gewinnradio;BetaDigital:12148:hC34:S19.2E:27500:0:528=deu:0:0:176:133:7:0
-domradio;BetaDigital:12460:hC34:S19.2E:27500:0:368=deu:0:0:171:133:5:0
-Radio Melodie,Melodie;BetaDigital:12460:hC34:S19.2E:27500:0:384=deu:0:0:172:133:5:0
-Klassik Radio,Klassik;BetaDigital:12460:hC34:S19.2E:27500:0:336=deu:0:0:173:133:5:0
-harmony.fm;T-Systems:12633:hC56:S19.2E:22000:0:1036=deu:0:0:12662:1:1113:0
-:->DW-Radio
-DW 1;ARD DW:12265:hC34:S19.2E:27500:0:301=deu:0:0:28416:1:1093:0
-DW 4;ARD DW:12265:hC34:S19.2E:27500:0:311=deu:0:0:28417:1:1093:0
-:->Premiere World
-PREMIERE 1,PREM 1;PREMIERE:11798:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1702,1831,1722,1830,1801:10:133:2:0
-PREMIERE 2,PREM 2;PREMIERE:11798:hC34:S19.2E:27500:1791:1792=deu,1793=deu;1795=deu:32:1831,1830,1722,1801,1702:11:133:2:0
-PREMIERE 3,PREM 3;PREMIERE:11798:hC34:S19.2E:27500:2303:2304=deu,2305=deu;2307=deu:32:1702,1830,1831,1801,1722:43:133:2:0
-PREMIERE 4,PREM 4;PREMIERE:11798:hC34:S19.2E:27500:767:768=deu,769=deu;771=deu:32:1831,1830,1801,1722,1702:9:133:2:0
-PREMIERE KRIMI,KRIMI;PREMIERE:11798:hC34:S19.2E:27500:2815:2816=deu:32:1830,1831,1722,1801,1702:23:133:2:0
-PREMIERE SERIE,SERIE;PREMIERE:11798:hC34:S19.2E:27500:2559:2560=deu;2563=deu:32:1722,1831,1830,1702,1801:16:133:2:0
-SCI FI;PREMIERE:12032:hC34:S19.2E:27500:1791:1792=deu:32:1830,1702,1831,1722,D05,B00,1801:36:133:4:0
-MGM;PREMIERE:12032:hC34:S19.2E:27500:2047:2048=deu,2049=deu:32:1702,1722,1830,1831,D05,B00,1801:515:133:4:0
-PREMIERE FILMFEST,FILMFEST;PREMIERE:11720:hC34:S19.2E:27500:1279:1280=deu:32:1831,1722,1702,1830,1801:20:133:3:0
-PREMIERE FILMCLASSICS,FILMCLASSICS;PREMIERE:11720:hC34:S19.2E:27500:1023:1024=deu:32:1830,1722,1702,1831,1801:41:133:3:0
-PREMIERE NOSTALGIE,NOSTALGIE;PREMIERE:11720:hC34:S19.2E:27500:1535:1536=deu:32:1830,1831,1722,1801,1702:516:133:3:0
-PREMIERE DIREKT,DIREKT;PREMIERE:12032:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:0:18:133:4:0
-Sonnenklar TV,SonnenTV;PREMIERE:12480:vC34:S19.2E:27500:2303:2304=deu:40:0:32:133:33:0
-STAR XL LIVE,STAR XL;PREMIERE:11876:hC34:S19.2E:27500:2815:2816:0:0:52:133:9:0
-1-2-3.tv;PREMIERE:12070:hC34:S19.2E:27500:2559:2560=deu:33:1831,1702,1722,1830,D05,1801:50:133:1:0
-13 TH STREET,13 TH;PREMIERE:12032:hC34:S19.2E:27500:511:512=deu:32:1830,1702,1722,1831,D05,B00,1801:42:133:4:0
-ANIMAL PLANET,ANIMAL;PREMIERE:11758:hC34:S19.2E:27500:2815:2816=deu:32:D05,1831,1830,1702,1722,B00,1801:12:133:17:0
-ANIMAX (a/P);arena/Premiere:12441:vC34:S19.2E:27500:2030:2031=deu,2032=eng:0:D22,1702,1801,1830:13203:1:1102:0
-AXN (a/P);arena/Premiere:11876:hC34:S19.2E:27500:767:768:0:1830,D22,1702,1801:62:133:9:0
-BEATE-UHSE.TV,B-UHSE;PREMIERE:11758:hC34:S19.2E:27500:1791:1792=deu:0:D05,1830,B00,1702,1722,1831,1801:21:133:17:0
-BIG BROTHER,BIG B;PREMIERE:12032:hC34:S19.2E:27500:255:256=deu:32:1722,1830,1702,1831,1801:664:133:4:0
-BOOMERANG (a/P),BOOM (a/P);arena/Premiere:11876:hC34:S19.2E:27500:1791:1792,1793:0:1830,D22,1702,1801:66:133:9:0
-Cartoon Network (a/P);arena/Premiere:12441:vC34:S19.2E:27500:2040:2041=deu,2042=eng:0:D22,1702,1801,1830:13204:1:1102:0
-CLASSICA;PREMIERE:11758:hC34:S19.2E:27500:511:512=deu:32:B00,1702,1722,1801,1831,1830,D05:24:133:17:0
-DISCOVERY CHANNEL,DISCOVERY;PREMIERE:11758:hC34:S19.2E:27500:1023:1024=deu:32:B00,D05,1722,1830,1831,1702,1801:14:133:17:0
-DISCOVERY GESCHICHTE,GESCHICHTE;PREMIERE:11758:hC34:S19.2E:27500:1535:1536=deu:32:D05,1722,B00,1830,1831,1702,1801:13:133:17:0
-DISNEY CHANNEL,DISNEY;PREMIERE:11758:hC34:S19.2E:27500:2559:2560=deu:32:1830,1831,1801,1702,1722:34:133:17:0
-DISNEY PLAYHOUSE (P),DISNEY P (P);PREMIERE:11876:hC34:S19.2E:27500:1279:1280:0:1801,1830,1702:64:133:9:0
-DISNEY TOON (P),DISNEY T (P);PREMIERE:11876:hC34:S19.2E:27500:1535:1536:0:1830,1801,1702:65:133:9:0
-E.CLIPS (P),E.CLIPS;PREMIERE:11876:hC34:S19.2E:27500:2047:2048:0:1830,1702,1801:67:133:9:0
-EROTIK - AB 18!,AB 18!;PREMIERE:12032:hC34:S19.2E:27500:1279:1280=deu:0:1702,1722,1831,1830,1801,1810:513:133:4:0
-FOCUS GESUNDHEIT,GESUND;PREMIERE:11758:hC34:S19.2E:27500:3071:3072=deu:32:B00,D05,1831,1722,1702,1830,1801:15:133:17:0
-GOLDSTAR TV,GOLDSTAR;PREMIERE:12070:hC34:S19.2E:27500:3839:3840=deu:32:B00,1831,D05,1702,1722,1830,1801:518:133:1:0
-HEIMATKANAL,HEIMAT;PREMIERE:12070:hC34:S19.2E:27500:1279:1280=deu:32:1830,1831,1722,1702,B00,D05,1801:22:133:1:0
-KINOWELT TV (P),KINOWELT (P);PREMIERE:11876:hC34:S19.2E:27500:255:256:0:1830,1702,1801:60:133:9:0
-lettra (a/P);arena/Premiere:11876:hC34:S19.2E:27500:2303:2304:0:D22,1702,1830,1801:68:133:9:0
-PASSION;PREMIERE:12070:hC34:S19.2E:27500:255:256=deu:0:B00,1830,1702,1831,1722,D05,D22,1801:29:133:1:0
-PREMIERE Austria,PREM A;PREMIERE:12148:hC34:S19.2E:27500:2559:2560=deu:35:D05,1801,1702:53:133:7:0
-PREMIERE START,START;PREMIERE:12070:hC34:S19.2E:27500:3071:3072=deu:32:1702,1830,1722,1831,1801:8:133:1:0
-ROMANCE TV,ROMANCE;PREMIERE:11876:hC34:S19.2E:27500:1023:1024:0:1702,1830,1801:63:133:9:0
-RTL CRIME;PREMIERE:12070:hC34:S19.2E:27500:1791:1792=deu:0:1702,1722,1830,D05,1831,D22,1801,B00:27:133:1:0
-TCM (a/P);arena/Premiere:11876:hC34:S19.2E:27500:511:512,513:0:D22,1702,1830,1801:61:133:9:0
-:->Premiere_Feeds
-NVOD-212;Premiere:12070:hC34:S19.2E:27500:0:0:0:0:212:133:1:0
-Fu�ball ENG:11758:hC34:S19.2E:27500:2047:2048=deu,2049=deu;2051=deu:32:1830,1831,1702,1801,1722:221:133:17:0
-D 3 - 17|30:11758:hC34:S19.2E:27500:3327:3328=deu,3329=deu;3331=deu:0:1831,1830,1702,1722,1801:226:133:17:0
-D 2 - 17|30:11758:hC34:S19.2E:27500:3583:3584=deu,3585=deu;3587=deu:0:1830,1831,1801,1702,1722:227:133:17:0
-Golf:11798:hC34:S19.2E:27500:3071:3072=deu,3073=deu;3075=deu:32:1702,1722,1831,1830,1801:224:133:2:0
-D 5 - 16|30:11798:hC34:S19.2E:27500:3327:3328=deu,3329=deu;3331=deu:0:1831,1830,1801,1722,1702:225:133:2:0
-COTT - BER:11720:hC34:S19.2E:27500:767:768=deu,769=deu;771=deu:32:1830,1722,1702,1831,1801:220:133:3:0
-Basketball NBA:11720:hC34:S19.2E:27500:511:512=deu,513=deu;515=deu:32:1702,1722,1831,1830,1801:222:133:3:0
-D 4 - 18|15:11720:hC34:S19.2E:27500:2559:2560=deu,2561=deu;2563=deu:0:1830,1702,1831,1801,1722:242:133:3:0
-D 3 - 17|00:11720:hC34:S19.2E:27500:2815:2816=deu,2817=deu;2819=deu:0:1722,1702,1831,1830,1801:243:133:3:0
-H96 - VFB:11720:hC34:S19.2E:27500:3071:3072=deu,3073=deu;3075=deu:32:1722,1830,1831,1801,1702:244:133:3:0
-D 5 - 18|15:12032:hC34:S19.2E:27500:3071:3072=deu,3073=deu;3075=deu:0:1722,1831,1830,1702,1801:208:133:4:0
-D 4 - 16|30:12032:hC34:S19.2E:27500:3327:3328=deu,3329=deu;3331=deu:0:1830,1831,1702,1722,1801:209:133:4:0
-Konferenz:12032:hC34:S19.2E:27500:767:768=deu,769=deu;771=deu:32:1830,1722,1702,1831,1801:223:133:4:0
-:->Arena
-Bundesliga 9;arena:12663:hC56:S19.2E:22000:0:0:0:0:13110:1:1115:0
-Biography Channel;arena:12441:vC34:S19.2E:27500:2080:2081=deu:0:D22:13208:1:1102:0
-Bundesliga 1;arena:12441:vC34:S19.2E:27500:2310:0:0:D22:13213:1:1102:0
-Bundesliga 2;arena:12441:vC34:S19.2E:27500:2310:0:0:D22:13214:1:1102:0
-Bundesliga 3;arena:12441:vC34:S19.2E:27500:2310:0:0:D22:13215:1:1102:0
-Bundesliga 4;arena:12441:vC34:S19.2E:27500:2310:0:0:D22:13216:1:1102:0
-Bundesliga 5;arena:12692:hC56:S19.2E:22000:0:0:0:D22:13017:1:1117:0
-Bundesliga 6;arena:12692:hC56:S19.2E:22000:0:0:0:D22:13018:1:1117:0
-Bundesliga 7;arena:12441:vC34:S19.2E:27500:2310:0:0:D22:13217:1:1102:0
-Bundesliga 8;arena:12441:vC34:S19.2E:27500:2310:0:0:D22:13218:1:1102:0
-Bundesliga HOME;arena:12441:vC34:S19.2E:27500:2110:2111=deu,2112=deu:0:D22:13211:1:1102:0
-Bundesliga INFO;arena:12441:vC34:S19.2E:27500:2310:0:0:D22:13212:1:1102:0
-History Channel;arena:12441:vC34:S19.2E:27500:2010:2011=deu:0:D22:13201:1:1102:0
-Kinowelt;arena:12441:vC34:S19.2E:27500:2060:2061=deu:2063:D22:13206:1:1102:0
-National Geographic Channel;arena:12441:vC34:S19.2E:27500:2020:2021=deu,2022=eng:0:D22:13202:1:1102:0
-RTL Living;arena:12441:vC34:S19.2E:27500:2070:2071=deu:0:D22,1702,1801,1830:13207:1:1102:0
-:->Shopping
-MDR SACHSEN;ARD:12109:hC34:S19.2E:27500:401:402=deu:404:0:28228:1:1073:0
-HSE24 Digital;SES Astra:12226:hC34:S19.2E:27500:512:660=deu:576:0:31210:1:1091:0
-MDR SACHSEN+;ARD:12421:hC34:S19.2E:27500:2901:2902=deu:2903:0:28328:1:1201:0
-HSE24,HSE24;BetaDigital:12480:vC34:S19.2E:27500:1279:1280=deu:37:0:40:133:33:0
-QVC Deutschland;QVC:12552:vC56:S19.2E:22000:165:166:167:0:12100:1:1108:0
-Best of shopping;GlobeCast:11597:vC56:S19.2E:22000:225:245:0:0:10062:1:1026:0
-M6 BOUTIQUE LA CHAINE;Globecast:11597:vC56:S19.2E:22000:1120:1130:0:0:10063:1:1026:0
-Q TV SHOP;BetaDigital:12148:hC34:S19.2E:27500:3071:3072=deu:0:0:54:133:7:0
-RTL Shop;RTL World:12188:hC34:S19.2E:27500:168:137:70:0:12080:1:1089:0
-RTL SHOP;RTL World:12188:hC34:S19.2E:27500:168:137=deu:70:0:12095:1:1089:0
-A1 Teleshop;BetaDigital:12246:vC34:S19.2E:27500:3583:3584=deu:0:0:10130:1:1092:0
-meinTVshop;BetaDigital:12480:vC34:S19.2E:27500:511:512=deu:0:0:899:133:33:0
-:->BetaDigital
-! Primetime;BetaDigital:12246:vC34:S19.2E:27500:767:768=deu:0:0:10102:1:1092:0
-.6live;BetaDigital:12246:vC34:S19.2E:27500:1519:1520=deu:0:0:10119:1:1092:0
-.Club1.TV;BetaDigital:12246:vC34:S19.2E:27500:1759:1760=deu:0:0:10155:1:1092:0
-1-2-3.tv;BetaDigital:12460:hC34:S19.2E:27500:2815:2816=deu:32:0:662:133:5:0
-2255live;BetaDigital:12246:vC34:S19.2E:27500:3567:3568=deu:0:0:10127:1:1092:0
-666 Girls.TV;BetaDigital:12246:vC34:S19.2E:27500:3807:3808=deu:0:0:10163:1:1092:0
-ACHTUNG Erotik.TV;BetaDigital:12246:vC34:S19.2E:27500:3039:3040=deu:0:0:10160:1:1092:0
-ACHTUNG Singles.TV;BetaDigital:12246:vC34:S19.2E:27500:2271:2272=deu:0:0:10157:1:1092:0
-Allesf�rsHandy;BetaDigital:12246:vC34:S19.2E:27500:4079:4080=deu:0:0:10129:1:1092:0
-Alpengl�hen TVX,AlpenTVX;BetaDigital:12148:hC34:S19.2E:27500:255:256=deu:0:1830,1801,1702:70:133:7:0
-Amore TV;BetaDigital:12246:vC34:S19.2E:27500:1775:1776=deu:0:0:10120:1:1092:0
-ANIXE SD;BetaDigital:12460:hC34:S19.2E:27500:3311:3312=deu:0:0:764:133:5:0
-AstroTV;BetaDigital:12480:vC34:S19.2E:27500:2559:2560=deu:41:0:661:133:33:0
-Blitzkontakt.TV;BetaDigital:12246:vC34:S19.2E:27500:1263:1264=deu:0:0:10118:1:1092:0
-BLUCOM DEMOKANAL,BLUCOM;BetaDigital:12460:hC34:S19.2E:27500:1791:1792=deu:0:0:1792:133:5:0
-DAF/OUTPRO;BetaDigital:12480:vC34:S19.2E:27500:2047:2048=deu:0:0:47:133:33:0
-Daystar Television Network,Daystar Television;BetaDigital:12460:hC34:S19.2E:27500:3567:3568=deu:0:0:658:133:5:0
-Der Schmuckkanal,Schmuck;BetaDigital:12148:hC34:S19.2E:27500:3583:3584=deu:33:0:775:133:7:0
-Deutsches Gesundheitsfernsehen;BetaDigital:12460:hC34:S19.2E:27500:1023:1024=deu:0:0:663:133:5:0
-DrDish Television;BetaDigital:12246:vC34:S19.2E:27500:2047:2048=deu:0:0:10107:1:1092:0
-entavio Home;BetaDigital:12246:vC34:S19.2E:27500:3071:0:0:0:10111:1:1092:0
-ERF;BetaDigital:12460:hC34:S19.2E:27500:511:512=deu,513=deu:0:0:48:133:5:0
-Erotik 24;BetaDigital:12246:vC34:S19.2E:27500:3295:3296=deu:0:0:10161:1:1092:0
-Franken SAT,FSAT;BetaDigital:12246:vC34:S19.2E:27500:1279:1280=deu:0:0:10104:1:1092:0
-Gebrauchtwagen TV;BetaDigital:12246:vC34:S19.2E:27500:2799:2800=deu:38:0:10124:1:1092:0
-GIGA;BetaDigital:12460:hC34:S19.2E:27500:1007:1008=deu:0:0:776:133:5:0
-gl�ck TV;BetaDigital:12480:vC34:S19.2E:27500:1791:1792=deu:0:0:46:133:33:0
-GOD Channel,GOD;BetaDigital:12148:hC34:S19.2E:27500:767:768=deu:0:0:774:133:7:0
-Herzschlag69;BetaDigital:12246:vC34:S19.2E:27500:2031:2032=deu:37:0:10121:1:1092:0
-JAMBA! TV,JAMBA!;BetaDigital:12460:hC34:S19.2E:27500:2303:2304=deu:0:0:1794:133:5:0
-Liebesgl�ck.TV;BetaDigital:12246:vC34:S19.2E:27500:479:480=deu:0:0:10150:1:1092:0
-Liebestraum.TV;BetaDigital:12246:vC34:S19.2E:27500:2783:2784=deu:0:0:10159:1:1092:0
-LokalSAT;BetaDigital:12246:vC34:S19.2E:27500:1535:1536=deu:0:0:10105:1:1092:0
-Lustkanal.TV;BetaDigital:12246:vC34:S19.2E:27500:975:976=deu:0:0:10167:1:1092:0
-maennerwelt.tv;BetaDigital:12246:vC34:S19.2E:27500:2543:2544=deu:0:0:10123:1:1092:0
-Mallorca.TV;BetaDigital:12246:vC34:S19.2E:27500:1487:1488=deu:0:0:10169:1:1092:0
-m�nchen.tv/RFO,m�tv/RFO;BetaDigital:12246:vC34:S19.2E:27500:1791:1792=deu:0:0:10106:1:1092:0
-ONTV Regional,ONTV;BetaDigital:12246:vC34:S19.2E:27500:1023:1024=deu:0:0:10103:1:1092:0
-Partnersuche.TV;BetaDigital:12246:vC34:S19.2E:27500:735:736=deu:0:0:10151:1:1092:0
-Po6;BetaDigital:12246:vC34:S19.2E:27500:3311:3312=deu:39:0:10126:1:1092:0
-ReiseSchn�ppchen.TV;BetaDigital:12246:vC34:S19.2E:27500:991:992=deu:0:0:10152:1:1092:0
-Ringtone TV;BetaDigital:12246:vC34:S19.2E:27500:1503:1504=deu:0:0:10154:1:1092:0
-RNFplus,RNF;BetaDigital:12148:hC34:S19.2E:27500:1104:1105=deu:38:0:768:133:7:0
-rtn myestate,rtn;BetaDigital:12148:hC34:S19.2E:27500:1279:1280=deu,1281=eng:0:0:767:133:7:0
-SAT Erotiktreff.TV;BetaDigital:12246:vC34:S19.2E:27500:719:720=deu:0:0:10166:1:1092:0
-SpiritON.TV,SpiritON;BetaDigital:12480:vC34:S19.2E:27500:767:768=deu:0:0:897:133:33:0
-tele6.tv;BetaDigital:12246:vC34:S19.2E:27500:2287:2288=deu:0:0:10122:1:1092:0
-TIER.TV;BetaDigital:12148:hC34:S19.2E:27500:2303:2304=deu:0:0:514:133:7:0
-tirol tv;BetaDigital:12246:vC34:S19.2E:27500:2559:2560=deu:0:0:10109:1:1092:0
-Traumkontakt.tv;BetaDigital:12246:vC34:S19.2E:27500:3055:3056=deu:0:0:10125:1:1092:0
-tv.gusto;BetaDigital:12460:hC34:S19.2E:27500:3071:3072=deu:0:0:659:133:5:0
-UProm.TV;BetaDigital:12460:hC34:S19.2E:27500:255:256=deu:0:0:766:133:5:0
-Venusclub.TV;BetaDigital:12246:vC34:S19.2E:27500:1247:1248=deu:0:0:10153:1:1092:0
-Voyages Television,Voyages;BetaDigital:12148:hC34:S19.2E:27500:1023:1024=deu:37:0:769:133:7:0
-XXHOME;BetaDigital:12480:vC34:S19.2E:27500:255:256=deu:0:0:898:133:33:0
-XXXKanal.TV;BetaDigital:12246:vC34:S19.2E:27500:463:464=deu:0:0:10165:1:1092:0
-YAVIDO CLIPS,Y CLIPS;BetaDigital:12148:hC34:S19.2E:27500:239:240=deu:0:0:765:133:7:0
-Zack Erotik TV;BetaDigital:12246:vC34:S19.2E:27500:1007:1008=deu:0:0:10117:1:1092:0
-.;BetaDigital:12246:vC34:S19.2E:27500:2815:0:0:1702,1801,1830:10110:1:1092:0
-BD 4;BetaDigital:12148:hC34:S19.2E:27500:2047:2048=deu:0:1801,1702:773:133:7:0
-:->T-Systems
-123Damenwahl;T-Systems:12633:hC56:S19.2E:22000:220:320:0:0:12620:1:1113:0
-Bahn TV;T-Systems:12633:hC56:S19.2E:22000:201:301=deu:501:0:12600:1:1113:0
-Date Line;T-Systems:12633:hC56:S19.2E:22000:223:323=deu:0:0:12623:1:1113:0
-Deutsche Girls 2;T-Systems:12633:hC56:S19.2E:22000:215:315:0:0:12615:1:1113:0
-dhd24.tv;T-Systems:12633:hC56:S19.2E:22000:53:54=deu:55:0:12604:1:1113:0
-Dreamgirls.TV;T-Systems:12633:hC56:S19.2E:22000:218:318:0:0:12618:1:1113:0
-Erotik Sat;T-Systems:12633:hC56:S19.2E:22000:219:319:0:0:12619:1:1113:0
-Fotohandy;T-Systems:12633:hC56:S19.2E:22000:224:324=deu:0:0:12624:1:1113:0
-Gems TV;T-Systems:12633:hC56:S19.2E:22000:1041:1042=deu:1043:0:12616:1:1113:0
-jeden Tag x;T-Systems:12633:hC56:S19.2E:22000:226:326=deu:0:0:12626:1:1113:0
-K-TV;T-Systems:12633:hC56:S19.2E:22000:202:302=deu:502:0:12601:1:1113:0
-Manneskraft.TV;T-Systems:12633:hC56:S19.2E:22000:206:306:0:0:12606:1:1113:0
-Mobile Sex;T-Systems:12633:hC56:S19.2E:22000:225:325=deu:0:0:12625:1:1113:0
-Nie mehr einsam TV;T-Systems:12633:hC56:S19.2E:22000:212:312:0:0:12612:1:1113:0
-Paradieserotik;T-Systems:12633:hC56:S19.2E:22000:230:330:0:0:12630:1:1113:0
-paradise;T-Systems:12633:hC56:S19.2E:22000:222:322=deu:522:0:12622:1:1113:0
-Peep TV;T-Systems:12633:hC56:S19.2E:22000:232:332=deu:0:0:12632:1:1113:0
-phab 16;T-Systems:12633:hC56:S19.2E:22000:235:335=deu:0:0:12635:1:1113:0
-rhein main tv;T-Systems:12633:hC56:S19.2E:22000:208:308=deu:508:0:12614:1:1113:0
-Seitensprung.TV;T-Systems:12633:hC56:S19.2E:22000:227:327:0:0:12627:1:1113:0
-Supreme Master TV;T-Systems:12633:hC56:S19.2E:22000:234:334=eng:0:0:12634:1:1113:0
-Traumgirls.TV;T-Systems:12633:hC56:S19.2E:22000:229:329:0:0:12629:1:1113:0
-:->ORF
-HITRADIO OE3;ORF:12692:hC56:S19.2E:22000:130:131=deu:0:0:13013:1:1117:0
-ORF2 B;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13005:1:1117:0
-ORF2 K;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13011:1:1117:0
-ORF2 N;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13004:1:1117:0
-ORF2 O;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13006:1:1117:0
-ORF2 S;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13007:1:1117:0
-ORF2 St;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13010:1:1117:0
-ORF2 T;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13008:1:1117:0
-ORF2 V;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13009:1:1117:0
-ORF2 W;ORF:12692:hC56:S19.2E:22000:500:501=deu;503=deu:505:1762,D05,1801,1702:13003:1:1117:0
-ORF2E;ORF:12692:hC56:S19.2E:22000:170:171=deu:505:0:13014:1:1117:0
-TW1;ORF:12663:hC56:S19.2E:22000:1010:1011=deu:1013:0:13101:1:1115:0
-:->GermanTvForOtherCountrys
-ProSieben Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:289:290=deu:33:0:20001:1:1082:0
-ProSieben Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:161:84=deu;85=deu:36:0:20002:1:1082:0
-Kabel 1 Schweiz;ProSiebenSat.1:12051:vC34:S19.2E:27500:162:163=deu:165:0:20003:1:1082:0
-Kabel 1 Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:166:167=deu:169:0:20004:1:1082:0
-SAT.1 A;ProSiebenSat.1:12051:vC34:S19.2E:27500:800:801=deu;803=deu:802:0:20005:1:1082:0
-SAT.1 CH;ProSiebenSat.1:12051:vC34:S19.2E:27500:1535:1536=deu:38:0:20006:1:1082:0
-Super RTL CH;RTL:12188:hC34:S19.2E:27500:172:145=deu:82:0:12041:1:1089:0
-VOX CH;RTL:12188:hC34:S19.2E:27500:173:146=deu:84:0:12061:1:1089:0
-RTL Austria;RTL:12226:hC34:S19.2E:27500:201:202=deu:203:0:28800:1:1091:0
-VOX Austria;RTL:12226:hC34:S19.2E:27500:301:302=deu:303:0:28805:1:1091:0
-RTL2 Austria;RTL:12226:hC34:S19.2E:27500:401:402:403:0:28810:1:1091:0
-Super RTL A;RTL:12226:hC34:S19.2E:27500:501:502=deu:503:0:28815:1:1091:0
-Sat.1 Comedy;ProSiebenSat.1:12545:hC56:S19.2E:22000:1535:1536=deu:0:1702,1801,1830,D22:17505:1:1107:0
-kabel eins classics;ProSiebenSat.1:12545:hC56:S19.2E:22000:1791:1792=deu:0:D22,1830,1801,1702:17506:1:1107:0
-:->CanalDigitaal_NL
-BiB;CANALDIGITAAL:12574:hC56:S19.2E:22000:521+8190:108:0:622,100:5029:53:1109:0
-BVN;CANALDIGITAAL:12574:hC56:S19.2E:22000:515+8190:96=dut:36:0:5025:53:1109:0
-EPG;CANALDIGITAAL:12515:hC56:S19.2E:22000:0:0:0:0:7199:53:1105:0
-Animal Planet;CANALDIGITAAL:12344:hC34:S19.2E:27500:514+8190:96=dut:35:622,100:2020:53:1097:0
-Cartoon/TCM;CANALDIGITAAL:12344:hC34:S19.2E:27500:520+8190:116=dut:37:622,100:2030:53:1097:0
-Discovery;CANALDIGITAAL:12344:hC34:S19.2E:27500:515+8190:88=dut:50:622,100:2015:53:1097:0
-DORCEL TV;CANALDIGITAAL:12344:hC34:S19.2E:27500:522+8190:124=dut:0:622,100,500:2045:53:1097:0
-Film1.1;CANALDIGITAAL:12515:hC56:S19.2E:22000:512+8190:80=dut:32:622,100:4005:53:1105:0
-Film1.2;CANALDIGITAAL:12515:hC56:S19.2E:22000:514+8190:104=dut:32:622,100:4007:53:1105:0
-Film1.3;CANALDIGITAAL:12574:hC56:S19.2E:22000:519+8190:86=dut:0:622,100:5028:53:1109:0
-Hallmark;CANALDIGITAAL:12574:hC56:S19.2E:22000:520+8190:106=dut:0:622,100:5011:53:1109:0
-Man-X;CANALDIGITAAL:12515:hC56:S19.2E:22000:515+8190:102=dut:0:100:4018:53:1105:0
-NED1;CANALDIGITAAL:12515:hC56:S19.2E:22000:517+8190:88=dut:34:622,100:4011:53:1105:0
-NED2;CANALDIGITAAL:12515:hC56:S19.2E:22000:518+8190:92=dut:35:622,100:4012:53:1105:0
-NED3;CANALDIGITAAL:12515:hC56:S19.2E:22000:519+8190:96=dut:36:622,100:4013:53:1105:0
-NET5;CANALDIGITAAL:12574:hC56:S19.2E:22000:513+8190:100=dut:37:622,100:5004:53:1109:0
-NGC;CANALDIGITAAL:12515:hC56:S19.2E:22000:523+8190:116=dut:39:622,100:4015:53:1105:0
-Nickelodeon/Comedy Central;CANALDIGITAAL:12515:hC56:S19.2E:22000:520+8190:98=dut:38:622,100:4014:53:1105:0
-RTL4;CANALDIGITAAL:12344:hC34:S19.2E:27500:512+8190:80=dut:32:622,100:2004:53:1097:0
-RTL5;CANALDIGITAAL:12344:hC34:S19.2E:27500:513+8190:92=dut:33:622,100:2005:53:1097:0
-RTL7;CANALDIGITAAL:12344:hC34:S19.2E:27500:518+8190:90=dut:38:622,100:2006:53:1097:0
-RTL8;CANALDIGITAAL:12344:hC34:S19.2E:27500:519+8190:108=dut:39:622,100:2035:53:1097:0
-SBS6;CANALDIGITAAL:12574:hC56:S19.2E:22000:514+8190:80=dut:32:622,100:5005:53:1109:0
-Tele2 / Het Gesprek;CANALDIGITAAL:12574:hC56:S19.2E:22000:517+8190:104=dut:35:622,100:5030:53:1109:0
-Tele2 2e kanaal;CANALDIGITAAL:12515:hC56:S19.2E:22000:521+8190:100=dut:37:622,100:4016:53:1105:0
-TV Oranje;CANALDIGITAAL:12344:hC34:S19.2E:27500:516+8190:84=dut:0:622,100:2010:53:1097:0
-Veronica/JETIX;CANALDIGITAAL:12574:hC56:S19.2E:22000:518+8190:92=dut:38:622,100:5020:53:1109:0
-:->TV Vlaanderen
-2BE;TV Vlaanderen:12670:vC56:S19.2E:22000:942+8190:922=dut:902:100:12772:53:1116:0
-2BE;TV Vlaanderen:12722:hC56:S19.2E:22000:942+8190:922=dut:902:100:12772:53:1119:0
-ActionNow;TV Vlaanderen:12670:vC56:S19.2E:22000:944+8190:924=dut:0:622,100:12774:53:1116:0
-ActionNow;TV Vlaanderen:12722:hC56:S19.2E:22000:944+8190:924=dut:0:622,100:12774:53:1119:0
-JIM;TV Vlaanderen:12670:vC56:S19.2E:22000:948+8190:933=dut:908:100:12783:53:1116:0
-JIM;TV Vlaanderen:12722:hC56:S19.2E:22000:948+8190:933=dut:908:100:12783:53:1119:0
-KANAAL Z;TV Vlaanderen:12670:vC56:S19.2E:22000:950+8190:935=dut:910:100:12785:53:1116:0
-KANAAL Z;TV Vlaanderen:12722:hC56:S19.2E:22000:950+8190:935=dut:910:100:12785:53:1119:0
-Ketnet/Canvas;TV Vlaanderen:12670:vC56:S19.2E:22000:946+8190:926=dut:906:622,100:12776:53:1116:0
-Ketnet/Canvas;TV Vlaanderen:12722:hC56:S19.2E:22000:946+8190:926=dut:906:622,100:12776:53:1119:0
-VIJFtv;TV Vlaanderen:12670:vC56:S19.2E:22000:949+8190:934=dut:909:100:12784:53:1116:0
-VIJFtv;TV Vlaanderen:12722:hC56:S19.2E:22000:949+8190:934=dut:909:100:12784:53:1119:0
-Vitaya;TV Vlaanderen:12670:vC56:S19.2E:22000:947+8190:927=dut:907:100:12777:53:1116:0
-Vitaya;TV Vlaanderen:12722:hC56:S19.2E:22000:947+8190:927=dut:907:100:12777:53:1119:0
-VT4;TV Vlaanderen:12670:vC56:S19.2E:22000:943+8190:923=dut:903:100:12773:53:1116:0
-VT4;TV Vlaanderen:12722:hC56:S19.2E:22000:943+8190:923=dut:903:100:12773:53:1119:0
-VTM;TV Vlaanderen:12670:vC56:S19.2E:22000:941+8190:921=dut:901:100:12771:53:1116:0
-VTM;TV Vlaanderen:12722:hC56:S19.2E:22000:941+8190:921=dut:901:100:12771:53:1119:0
-��n;TV Vlaanderen:12670:vC56:S19.2E:22000:945+8190:925=dut:905:622,100:12775:53:1116:0
-��n;TV Vlaanderen:12722:hC56:S19.2E:22000:945+8190:925=dut:905:622,100:12775:53:1119:0
-:->Csat France
-13EME RUE HD;CSAT:12363:vC34:S19.2E:27500:2047+8191:0:0:0:9116:1:1098:0
-A LA CARTE 1;CSAT:12129:vC34:S19.2E:27500:161:84=fra,85=eng:35:100:8402:1:1086:0
-A LA CARTE;CSAT:12012:vC34:S19.2E:27500:0:224=fra:0:0:8812:1:1080:0
-ADIBOU TV;CSAT:12363:vC34:S19.2E:27500:0:1992=fra:0:0:9109:1:1098:0
-CANAL EVENEMENT;CSAT:11479:vC56:S19.2E:22000:160:80=fra:0:0:6401:1:1018:0
-CANAL+ HI-TECH.;CSAT:11856:vC34:S19.2E:27500:163:92=fra,93=eng:41:500,100:8213:1:1072:0
-CANAL+;CSAT:11856:vC34:S19.2E:27500:2047+8191:0:0:0:8221:1:1072:0
-CASH TV;CSAT:12324:vC34:S19.2E:27500:169:116=fra:0:0:8611:1:1096:0
-CASH TVi;CSAT:12363:vC34:S19.2E:27500:0:1986=fra:0:0:9106:1:1098:0
-CDN12;CSAT:12324:vC34:S19.2E:27500:0:2046=fra:0:0:8616:1:1096:0
-CDN2;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9195:1:1098:0
-CDN5;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9198:1:1098:0
-CDN6;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9196:1:1098:0
-CDN7;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9197:1:1098:0
-CE SOIR;CSAT:12363:vC34:S19.2E:27500:0:2046=fra:0:0:9120:1:1098:0
-CINE PREMIER HD;CSAT:12363:vC34:S19.2E:27500:2047+8191:0:0:0:9115:1:1098:0
-CINE+;CSAT:12012:vC34:S19.2E:27500:168:112=fra,113=eng:0:0:8809:1:1080:0
-CINE+;CSAT:12012:vC34:S19.2E:27500:168:112=fra,113=eng:0:0:8810:1:1080:0
-DISNEY MAGIC HD;CSAT:12324:vC34:S19.2E:27500:2047+8191:0:0:0:8618:1:1096:0
-DOWNLOAD TNTSAT SAGEM;CSAT:11856:vC34:S19.2E:27500:0:0:0:0:8295:1:1072:0
-DOWNLOAD TNTSAT SAGEM;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9194:1:1098:0
-DOWNLOAD TNTSAT STRONG;CSAT:11856:vC34:S19.2E:27500:0:0:0:0:8297:1:1072:0
-DT10;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9159:1:1098:0
-DT11;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9160:1:1098:0
-DT12;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9161:1:1098:0
-DT13;CSAT:12363:vC34:S19.2E:27500:0:108=fra:0:0:9162:1:1098:0
-DT14;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9163:1:1098:0
-DT15;CSAT:12363:vC34:S19.2E:27500:165:80=fra:0:0:9164:1:1098:0
-DT16;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9165:1:1098:0
-DT17;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9166:1:1098:0
-DT18;CSAT:12363:vC34:S19.2E:27500:165:108=fra:0:0:9167:1:1098:0
-DT19;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9168:1:1098:0
-DT1;CSAT:12363:vC34:S19.2E:27500:165:108=fra:0:500:9150:1:1098:0
-DT20;CSAT:12363:vC34:S19.2E:27500:0:1992=fra:1399:0:9169:1:1098:0
-DT2;CSAT:12363:vC34:S19.2E:27500:0:1992=fra:0:0:9151:1:1098:0
-DT4;CSAT:12363:vC34:S19.2E:27500:165:108=fra:0:0:9153:1:1098:0
-DT5;CSAT:12363:vC34:S19.2E:27500:162:108=fra:0:0:9154:1:1098:0
-DT6;CSAT:12363:vC34:S19.2E:27500:162+8191:108=fra:0:0:9155:1:1098:0
-DT7;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9156:1:1098:0
-DT8;CSAT:12363:vC34:S19.2E:27500:165:108=fra:0:0:9157:1:1098:0
-DT9;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9158:1:1098:0
-ESPACE CLIENT;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9110:1:1098:0
-GUIDE TV;CSAT:12363:vC34:S19.2E:27500:2047+8191:0:0:0:9101:1:1098:0
-M6 HD;CSAT:12363:vC34:S19.2E:27500:2047+8191:0:0:0:9114:1:1098:0
-MEZZO.;CSAT:11817:vC34:S19.2E:27500:166:104=fra:0:100,1810:8012:1:1070:0
-MMD;CSAT:12324:vC34:S19.2E:27500:840+8191:0:0:100:8609:1:1096:0
-MON CSAT;CSAT:12363:vC34:S19.2E:27500:0:0:0:0:9104:1:1098:0
-MOSAIQUE;CSAT:12324:vC34:S19.2E:27500:162:1901,1902,1903,1904,1905,1906,1907,1908,1909,1910,1911,1912,1913,1914,1915,1916:0:0:8641:1:1096:0
-MOSAIQUE;CSAT:12324:vC34:S19.2E:27500:162:1906=A,1901=A,1902=A,1903=A,1904=fra,1905=A,1907=A,1908=eng,1909=A,1910=bre,1911=A,1912=A,1913=A,1914=A,1915=A,1916=A,1917=A,1918=A,1919=A,1920=A:0:0:8603:1:1096:0
-MOSAIQUE;CSAT:12324:vC34:S19.2E:27500:168:0:0:0:8608:1:1096:0
-NATIONAL GEO HD;CSAT:12363:vC34:S19.2E:27500:2047+8191:0:0:0:9103:1:1098:0
-NCMESS;CSAT:11817:vC34:S19.2E:27500:2047+8191:0:0:0:8013:1:1070:0
-No name;CSAT:11895:vC34:S19.2E:27500:2047+8191:0:0:0:8361:1:1074:0
-No name;CSAT:11895:vC34:S19.2E:27500:2047+8191:0:0:0:8363:1:1074:0
-No name;CSAT:12324:vC34:S19.2E:27500:0:2046=fra:0:0:8601:1:1096:0
-No name;CSAT:12324:vC34:S19.2E:27500:2047+8191:0:0:0:8615:1:1096:0
-No name;CSAT:12324:vC34:S19.2E:27500:2047+8191:0:0:0:8617:1:1096:0
-No name;CSAT:12363:vC34:S19.2E:27500:0:2046=fra:0:0:9122:1:1098:0
-No name;CSAT:12363:vC34:S19.2E:27500:0:2046=fra:0:0:9124:1:1098:0
-No name;CSAT:12363:vC34:S19.2E:27500:0:2046=fra:0:0:9126:1:1098:0
-No name;CSAT:12363:vC34:S19.2E:27500:2047+8191:0:0:0:9107:1:1098:0
-No name;CSAT:12363:vC34:S19.2E:27500:2047+8191:0:0:0:9108:1:1098:0
-No name;CSAT:12610:vC56:S19.2E:22000:2047+8191:0:0:0:9612:1:1112:0
-PLAYIN'TV;CSAT:11479:vC56:S19.2E:22000:166:104=fra:0:0:6430:1:1018:0
-PLAYIN'Tvi;CSAT:11479:vC56:S19.2E:22000:0:1988=fra:0:0:6431:1:1018:0
-TEST CDN 8;CSAT:11895:vC34:S19.2E:27500:2047+8191:0:0:0:8360:1:1074:0
-TF1 HD;CSAT:12363:vC34:S19.2E:27500:2047+8191:0:0:0:9113:1:1098:0
-13EME RUE;CSAT:12402:vC34:S19.2E:27500:162:88=fra:0:500,100:8703:1:1100:0
-A LA CARTE 10;CSAT:12012:vC34:S19.2E:27500:170:120=fra:0:100:8811:1:1080:0
-A LA CARTE 11;CSAT:12012:vC34:S19.2E:27500:171:124=fra:0:100:8804:1:1080:0
-A LA CARTE 12;CSAT:12207:vC34:S19.2E:27500:170:120=fra,121=eng:0:0:8515:1:1090:0
-A LA CARTE 13;CSAT:12129:vC34:S19.2E:27500:166:104=fra,105=fra:0:100:8411:1:1086:0
-A LA CARTE 14;CSAT:12129:vC34:S19.2E:27500:167:108=fra:0:100:8412:1:1086:0
-A LA CARTE 2;CSAT:12129:vC34:S19.2E:27500:162:88=fra:0:100:8403:1:1086:0
-A LA CARTE 3;CSAT:12129:vC34:S19.2E:27500:163:92=fra,93=fra:0:100:8404:1:1086:0
-A LA CARTE 4;CSAT:12129:vC34:S19.2E:27500:164:96=fra,97=eng;98=fra,99=eng:0:0:8405:1:1086:0
-A LA CARTE 5;CSAT:12129:vC34:S19.2E:27500:165:100=fra,101=fra:0:100:8406:1:1086:0
-A LA CARTE 6;CSAT:12129:vC34:S19.2E:27500:166:104=fra,105=fra:0:100:8407:1:1086:0
-A LA CARTE 7;CSAT:12129:vC34:S19.2E:27500:167:108=fra:0:100:8408:1:1086:0
-A LA CARTE 8;CSAT:12129:vC34:S19.2E:27500:168:112=fra:0:100:8409:1:1086:0
-A LA CARTE 9;CSAT:12129:vC34:S19.2E:27500:169:116=fra,117=fra:0:100:8410:1:1086:0
-AB MOTEURS;CSAT:12610:vC56:S19.2E:22000:162:88=fra:0:500:9603:1:1112:0
-AB1;CSAT:12610:vC56:S19.2E:22000:161:84=fra:0:500:9602:1:1112:0
-ACTION;CSAT:12610:vC56:S19.2E:22000:168:112=fra:0:500:9609:1:1112:0
-ANIMAUX;CSAT:12610:vC56:S19.2E:22000:166:104=fra:0:500:9607:1:1112:0
-BABY FIRST;CSAT:11479:vC56:S19.2E:22000:163:92=fra:0:500,100:6404:1:1018:0
-BLOOMBERG TV;CSAT:12640:vC56:S19.2E:22000:163:92=fra:0:500,100:8904:1:1114:0
-C CINEMA 16/9;CSAT:12168:vC34:S19.2E:27500:164:96=fra,97=eng:44:500,100:9505:1:1088:0
-C CINEMA CLASSIC;CSAT:12402:vC34:S19.2E:27500:168:112=fra,113=eng:56:500,100:8709:1:1100:0
-C CINEMA CULTE;CSAT:11895:vC34:S19.2E:27500:166:104=fra,105=eng:50:500,100:8351:1:1074:0
-C CINEMA EMOTION;CSAT:11817:vC34:S19.2E:27500:161:84=fra,85=eng:35:500,100:8002:1:1070:0
-C CINEMA FAMIZ;CSAT:12402:vC34:S19.2E:27500:170:120=fra,121=eng:62:500,100:8711:1:1100:0
-C CINEMA FRISSON;CSAT:11817:vC34:S19.2E:27500:162:88=fra,89=eng:38:500,100:8003:1:1070:0
-C CINEMA PREMIER;CSAT:11856:vC34:S19.2E:27500:165:100=fra,101=eng:47:500,100:8206:1:1072:0
-C CINEMA STAR;CSAT:12090:vC34:S19.2E:27500:164:96=fra,97=eng:47:500,100:9405:1:1084:0
-CANAL J;CSAT:11934:vC34:S19.2E:27500:167:108=fra:0:500,100:8157:1:1076:0
-CANAL+ CINEMA;CSAT:11856:vC34:S19.2E:27500:162:88=fra,89=eng:38:500,100:8203:1:1072:0
-CANAL+ DECALE;CSAT:11856:vC34:S19.2E:27500:161:84=fra,85=eng:35:500,100:8202:1:1072:0
-CANAL+ FAMILY;CSAT:11934:vC34:S19.2E:27500:171:124=fra,125=eng:65:500,100:8163:1:1076:0
-CANAL+ HI-TECH;CSAT:11856:vC34:S19.2E:27500:163:92=fra,93=eng;94=fra,95=eng:41:500,100:8204:1:1072:0
-CANAL+;CSAT:11856:vC34:S19.2E:27500:160:80=fra,81=eng:32:500,100:8201:1:1072:0
-CHEZ VOUS TV;CSAT:11895:vC34:S19.2E:27500:169:116=fra:0:500,100:8355:1:1074:0
-CINE FX;CSAT:12610:vC56:S19.2E:22000:163:92=fra:0:500:9604:1:1112:0
-CINE POLAR;CSAT:12640:vC56:S19.2E:22000:161:84=fra:0:500,100:8902:1:1114:0
-COMEDIE !;CSAT:12402:vC34:S19.2E:27500:161:84=fra,85=eng:35:500,100:8702:1:1100:0
-CUISINE TV;CSAT:11934:vC34:S19.2E:27500:165:100=fra:0:500,100:8160:1:1076:0
-DISCOVERY;CSAT:12090:vC34:S19.2E:27500:167:108=fra:0:500,100:9408:1:1084:0
-DISNEY CHANNEL+1;CSAT:12640:vC56:S19.2E:22000:165:100=fra,101=eng:47:500,100:8906:1:1114:0
-DISNEY CHANNEL;CSAT:11856:vC34:S19.2E:27500:166:104=fra,105=eng:50:500,100:8207:1:1072:0
-DISNEY CINEMAGIC;CSAT:12640:vC56:S19.2E:22000:167:108=fra,109=eng:53:500,100:8908:1:1114:0
-DISNEY MAGIC+1;CSAT:12640:vC56:S19.2E:22000:168:112=fra,113=eng:56:500,100:8909:1:1114:0
-E! ENTERTAINMENT;CSAT:12640:vC56:S19.2E:22000:170:120=fra:0:500,100:8911:1:1114:0
-ENCYCLOPEDIA;CSAT:12168:vC34:S19.2E:27500:170:120=fra:0:500:9511:1:1088:0
-EQUIDIA INFO;CSAT:12402:vC34:S19.2E:27500:160:80=fra:0:500,100:8701:1:1100:0
-EQUIDIA;CSAT:11856:vC34:S19.2E:27500:168:112=fra:0:500,100:8209:1:1072:0
-ESCALES;CSAT:12610:vC56:S19.2E:22000:167:108=fra:0:500:9608:1:1112:0
-FILLES TV;CSAT:11934:vC34:S19.2E:27500:169:116=fra:0:500,100:8161:1:1076:0
-FR3 AMIENS;CSAT:12699:vC56:S19.2E:22000:160:80=fra:32:500,100:9701:1:1118:0
-FR3 BESANCON;CSAT:12699:vC56:S19.2E:22000:161:84=fra:35:500,100:9702:1:1118:0
-FR3 BORDEAUX;CSAT:12699:vC56:S19.2E:22000:162:88=fra:38:500,100:9703:1:1118:0
-FR3 CAEN;CSAT:12728:vC56:S19.2E:22000:160:80=fra:32:500,100:9801:1:1120:0
-FR3 CLERMONT FD;CSAT:12699:vC56:S19.2E:22000:164:96=fra:44:500,100:9705:1:1118:0
-FR3 DIJON;CSAT:12728:vC56:S19.2E:22000:164:96=fra:44:500,100:9805:1:1120:0
-FR3 GRENOBLE;CSAT:12728:vC56:S19.2E:22000:167:108=fra:53:500,100:9808:1:1120:0
-FR3 LILLE;CSAT:12728:vC56:S19.2E:22000:168:112=fra:56:500,100:9809:1:1120:0
-FR3 LIMOGES;CSAT:12699:vC56:S19.2E:22000:168:112=fra:56:500,100:9709:1:1118:0
-FR3 LYON;CSAT:12699:vC56:S19.2E:22000:169:116=fra:59:500,100:9710:1:1118:0
-FR3 MARSEILLE;CSAT:12699:vC56:S19.2E:22000:170:120=fra:62:500,100:9711:1:1118:0
-FR3 MONTPELLIER;CSAT:12728:vC56:S19.2E:22000:170:120=fra:62:500,100:9811:1:1120:0
-FR3 NANCY;CSAT:12699:vC56:S19.2E:22000:163:92=fra:41:500,100:9704:1:1118:0
-FR3 NANTES;CSAT:12728:vC56:S19.2E:22000:161:84=fra:35:500,100:9802:1:1120:0
-FR3 NICE;CSAT:12728:vC56:S19.2E:22000:162:88=fra:38:500,100:9803:1:1120:0
-FR3 ORLEANS;CSAT:12728:vC56:S19.2E:22000:163:92=fra:41:500,100:9804:1:1120:0
-FR3 PARIS;CSAT:12699:vC56:S19.2E:22000:165:100=fra:47:500,100:9706:1:1118:0
-FR3 POITIERS;CSAT:12728:vC56:S19.2E:22000:165:100=fra:47:500,100:9806:1:1120:0
-FR3 REIMS;CSAT:12728:vC56:S19.2E:22000:166:104=fra:50:500,100:9807:1:1120:0
-FR3 RENNES;CSAT:12699:vC56:S19.2E:22000:166:104=fra:50:500,100:9707:1:1118:0
-FR3 ROUEN;CSAT:12699:vC56:S19.2E:22000:167:108=fra:53:500,100:9708:1:1118:0
-FR3 STRASBOURG;CSAT:12728:vC56:S19.2E:22000:169:116=fra:59:500,100:9810:1:1120:0
-FR3 TOULOUSE;CSAT:12699:vC56:S19.2E:22000:171:124=fra:65:500,100:9712:1:1118:0
-FR3 VIA STELLA;CSAT:12728:vC56:S19.2E:22000:171:124=fra:65:500,100:9812:1:1120:0
-FRANCE 2;CSAT:12012:vC34:S19.2E:27500:160:80=fra:32:500,100:8801:1:1080:0
-FRANCE 2;CSAT:12012:vC34:S19.2E:27500:160:80=fra:32:500,100:8821:1:1080:0
-FRANCE 3;CSAT:12012:vC34:S19.2E:27500:161:84=fra:35:500,100:8802:1:1080:0
-FRANCE 3;CSAT:12012:vC34:S19.2E:27500:161:84=fra:35:500,100:8822:1:1080:0
-FRANCE 4;CSAT:12168:vC34:S19.2E:27500:168:112=fra:0:500,100:9509:1:1088:0
-FRANCE 4;CSAT:12168:vC34:S19.2E:27500:168:112=fra:0:500,100:9529:1:1088:0
-FRANCE 5;CSAT:12207:vC34:S19.2E:27500:160:80=fra:32:500,100:8501:1:1090:0
-FRANCE 5;CSAT:12207:vC34:S19.2E:27500:160:80=fra:32:0:8591:1:1090:0
-FRANCE �;CSAT:12207:vC34:S19.2E:27500:165:100=fra:0:500,100:8508:1:1090:0
-GULLI;CSAT:12640:vC56:S19.2E:22000:162:88=fra:0:500,100:8903:1:1114:0
-GULLI;CSAT:12640:vC56:S19.2E:22000:162:88=fra:0:500,100:8921:1:1114:0
-HISTOIRE;CSAT:11817:vC34:S19.2E:27500:171:124=fra:0:500,100:8011:1:1070:0
-I>TELE;CSAT:11817:vC34:S19.2E:27500:169:116=fra:0:500,100,1810:8010:1:1070:0
-I>TELE;CSAT:11817:vC34:S19.2E:27500:169:116=fra:0:500,100,1810:8021:1:1070:0
-JETIX;CSAT:12402:vC34:S19.2E:27500:164:96=fra:0:500,100:8705:1:1100:0
-JIMMY;CSAT:11817:vC34:S19.2E:27500:165:100=fra,101=eng:47:500,100:8006:1:1070:0
-L'EQUIPE TV;CSAT:12402:vC34:S19.2E:27500:165:100=fra:0:500,100:8706:1:1100:0
-LA CHAINE METEO;CSAT:11817:vC34:S19.2E:27500:167:108=fra:0:500,100:8008:1:1070:0
-LCI;CSAT:11934:vC34:S19.2E:27500:166:104=fra:0:500,100:8156:1:1076:0
-M6;CSAT:11895:vC34:S19.2E:27500:163:92=fra:59:500,100:8372:1:1074:0
-MANGAS;CSAT:12610:vC56:S19.2E:22000:164:96=fra:0:500:9605:1:1112:0
-MEZZO;CSAT:11817:vC34:S19.2E:27500:166:104=fra:0:500,100,1810:8007:1:1070:0
-MOTORS TV;CSAT:12012:vC34:S19.2E:27500:165:100=fra,101=eng:0:500,100:8816:1:1080:0
-NATIONAL GEO;CSAT:12402:vC34:S19.2E:27500:169:116=fra:0:500,100:8708:1:1100:0
-No name;CSAT:12168:vC34:S19.2E:27500:169:116=fra:0:100:9510:1:1088:0
-NRJ 12;CSAT:12402:vC34:S19.2E:27500:171:124=fra;125=fra:0:500,100:8710:1:1100:0
-NRJ 12;CSAT:12402:vC34:S19.2E:27500:171:124=fra;125=fra:0:500,100:8721:1:1100:0
-OLTV;CSAT:12207:vC34:S19.2E:27500:171:124=fra:0:500,100:8517:1:1090:0
-OM'TV;CSAT:12207:vC34:S19.2E:27500:167:108=fra:0:500,100:8516:1:1090:0
-ONZEO;CSAT:12324:vC34:S19.2E:27500:161:84=fra:0:500,100:8602:1:1096:0
-PARIS PREMIERE;CSAT:11817:vC34:S19.2E:27500:164:96=fra,97=eng:44:500,100:8005:1:1070:0
-PINK TV/PINK X;CSAT:12090:vC34:S19.2E:27500:168:112=fra:0:500,100:9409:1:1084:0
-PIWI;CSAT:12168:vC34:S19.2E:27500:166:104=fra:0:500,100:9507:1:1088:0
-PLANETE JUNIORS;CSAT:11934:vC34:S19.2E:27500:168:112=fra:0:500,100:8159:1:1076:0
-PLANETE JUSTICE;CSAT:11479:vC56:S19.2E:22000:164:96=fra:0:500,100:6405:1:1018:0
-PLANETE NO LIMIT;CSAT:12402:vC34:S19.2E:27500:166:104=fra:0:500,100:8707:1:1100:0
-PLANETE THALASSA;CSAT:12207:vC34:S19.2E:27500:163:92=fra:0:500,100:8504:1:1090:0
-PLANETE;CSAT:11934:vC34:S19.2E:27500:162:88=fra:0:500,100:8153:1:1076:0
-PLAYHOUSE DISNEY;CSAT:12640:vC56:S19.2E:22000:166:104=fra,105=eng:0:500,100:8907:1:1114:0
-REAL TIME;CSAT:12402:vC34:S19.2E:27500:163:92=fra:0:500,100:8704:1:1100:0
-RTL9;CSAT:12610:vC56:S19.2E:22000:160:80=fra:0:500:9601:1:1112:0
-SAILING CHANNEL;CSAT:12324:vC34:S19.2E:27500:171:124=fra,125=eng,126=deu:0:500,100:8607:1:1096:0
-SCI FI;CSAT:11856:vC34:S19.2E:27500:174:136=fra,137=eng:56:500,100:8215:1:1072:0
-SEASONS;CSAT:11817:vC34:S19.2E:27500:160:80=fra:0:0:8001:1:1070:0
-SERIE CLUB;CSAT:12090:vC34:S19.2E:27500:161:84=fra,85=eng:36:500,100:9402:1:1084:0
-TELE MELODY;CSAT:12012:vC34:S19.2E:27500:167:108=fra:0:500,100:8808:1:1080:0
-TELEREALITE;CSAT:11479:vC56:S19.2E:22000:162:88=fra:0:500,100:6403:1:1018:0
-TELETOON+1;CSAT:12090:vC34:S19.2E:27500:169:116=fra:0:500,100:9410:1:1084:0
-TELETOON;CSAT:12090:vC34:S19.2E:27500:165:100=fra:0:500,100:9406:1:1084:0
-TEVA;CSAT:12640:vC56:S19.2E:22000:164:96=fra:0:500,100:8905:1:1114:0
-TF1;CSAT:11895:vC34:S19.2E:27500:171:124=fra,125=eng:53:500,100:8366:1:1074:0
-TF1;CSAT:11895:vC34:S19.2E:27500:171:124=fra,125=eng:53:500,100:8371:1:1074:0
-TF6;CSAT:12168:vC34:S19.2E:27500:160:80=fra:32:500,100:9501:1:1088:0
-TIJI;CSAT:11934:vC34:S19.2E:27500:170:120=fra:0:500,100:8162:1:1076:0
-TMC;CSAT:11934:vC34:S19.2E:27500:161:84=fra:0:500,100:8152:1:1076:0
-TMC;CSAT:11934:vC34:S19.2E:27500:161:84=fra:0:500,100:8171:1:1076:0
-TOUTE L'HISTOIRE;CSAT:12610:vC56:S19.2E:22000:169:116=fra:0:500:9610:1:1112:0
-TPS STAR;CSAT:12090:vC34:S19.2E:27500:160:80=fra,81=eng:35:500,100:9401:1:1084:0
-TRACE TV;CSAT:12012:vC34:S19.2E:27500:166:104=fra:0:500,100:8807:1:1080:0
-TV BREIZH;CSAT:12207:vC34:S19.2E:27500:161:84=fra,85=bre:0:500,100:8502:1:1090:0
-USHUAIA TV;CSAT:12168:vC34:S19.2E:27500:161:84=fra:0:500,100:9502:1:1088:0
-VIRGIN 17;CSAT:11895:vC34:S19.2E:27500:168:112=fra:0:500,100:8358:1:1074:0
-VIRGIN 17;CSAT:11895:vC34:S19.2E:27500:168:112=fra:0:500,100:8374:1:1074:0
-VIVOLTA;CSAT:11479:vC56:S19.2E:22000:161:84=fra:0:500,100:6402:1:1018:0
-VOYAGE;CSAT:11934:vC34:S19.2E:27500:164:96=fra:0:500,100:8155:1:1076:0
-W9;CSAT:12090:vC34:S19.2E:27500:162:88=fra,89=eng:41:500,100:9403:1:1084:0
-W9;CSAT:12090:vC34:S19.2E:27500:162:88=fra,89=eng:41:500,100:9423:1:1084:0
-:->Taquilla
-TAQUILLA 10;TQ10:10788:vC56:S19.2E:22000:162:88=esl,89=eng,90,91:38:0:30362:1:1054:0
-TAQUILLA 8;TQ8:11097:vC56:S19.2E:22000:170:120=esl,121=eng:62:100,1810:30063:1:1042:0
-TAQUILLA 9;TQ9:11097:vC56:S19.2E:22000:173:132=esl,133=eng,134,135:71:0:30060:1:1042:0
-TAQUILLA 1;TQ1:10788:vC56:S19.2E:22000:168:112=esl,113=eng:56:100,1810:30350:1:1054:0
-TAQUILLA 2;TQ2:10788:vC56:S19.2E:22000:170:120=esl,121=eng:62:100,1810:30351:1:1054:0
-TAQUILLA 3;TQ3:10788:vC56:S19.2E:22000:171:124=esl,125=eng:65:100,1810:30352:1:1054:0
-TAQUILLA 4;TQ4:10788:vC56:S19.2E:22000:167:108=esl,109=eng:53:100,1810:30353:1:1054:0
-TAQUILLA 5;TQ5:11097:vC56:S19.2E:22000:160:80=esl,81=eng:32:100,1810:30053:1:1042:0
-TAQUILLA 6;TQ6:11097:vC56:S19.2E:22000:171:124=esl,125=eng:65:100,1810:30054:1:1042:0
-TAQUILLA 7;TQ7:11097:vC56:S19.2E:22000:168:112=esl,113=eng:56:100,1810:30055:1:1042:0
-TAQUILLA X;TQ10:11097:vC56:S19.2E:22000:163:92=esl:0:100,1810:30056:1:1042:0
-:->Digital+
-ABONO F�TBOL+;Digital+:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30196:1:1058:0
-ANDALUC�A TV;DIGITAL+:11686:vC56:S19.2E:22000:162:88=esl,89=eng:38:0:30202:1:1032:0
-CANAL CLUB;DIGITAL+:11686:vC56:S19.2E:22000:166:104=esl:0:0:30205:1:1032:0
-CANAL+ HD;DIGITAL+:10847:vC56:S19.2E:22000:175:0:0:0:30162:1:1058:0
-CANAL+ HD;DIGITAL+:11436:vC56:S19.2E:22000:0:0;96=esl,97=eng:0:1810:29900:1:1016:0
-CARTELERA;DIGITAL+:10847:vC56:S19.2E:22000:0:0:0:0:30160:1:1058:0
-CLAN TVE;Digital+:10979:vC56:S19.2E:22000:160:80=esl,81=eng:0:100,1810:30654:1:1034:0
-COMPRA SMS;DIGITAL+:10847:vC56:S19.2E:22000:163:0:0:0:30125:1:1058:0
-COMPRA SMS;DIGITAL+:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30172:1:1058:0
-CUATRO;Digital+:10979:vC56:S19.2E:22000:173:132=esl,133=eng:71:100,1810:30662:1:1034:0
-CUATRO;Digital+:10979:vC56:S19.2E:22000:173:132=esl,133=eng:71:100,1810:30663:1:1034:0
-EHS;Digital+:10979:vC56:S19.2E:22000:170:120=esl:0:0:30660:1:1034:0
-EUSKADI TV;DIGITAL+:11686:vC56:S19.2E:22000:163:92:0:0:30203:1:1032:0
-FERIA ABRIL;DIGITAL+:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30166:1:1058:0
-FERIA ABRIL;DIGITAL+:11156:vC56:S19.2E:22000:168:112=esl:0:100,1810:30515:1:1046:0
-GU�A DIGITAL+;DIGITAL+:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30121:1:1058:0
-GU�A DIGITAL+;Digital+:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30129:1:1058:0
-IBERDROLA;DIGITAL+:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30158:1:1058:0
-No name;Digital +:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30122:1:1058:0
-No name;Digital +:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30123:1:1058:0
-No name;Digital +:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30126:1:1058:0
-No name;Digital +:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30159:1:1058:0
-No name;Digital +:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30169:1:1058:0
-No name;Digital +:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30190:1:1058:0
-No name;DIGITAL+:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30127:1:1058:0
-No name;DIGITAL+:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30151:1:1058:0
-No name;DIGITAL+:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30154:1:1058:0
-No name;DIGITAL+:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30156:1:1058:0
-No name;Digital+:10847:vC56:S19.2E:22000:163:400=esl,254=esl:0:0:30189:1:1058:0
-No name;DIGITAL+:10847:vC56:S19.2E:22000:163:400=esl,254=esl:0:0:30191:1:1058:0
-No name;Digital+:10847:vC56:S19.2E:22000:163:400=esl,254=esl:0:0:30193:1:1058:0
-No name;Digital+:10847:vC56:S19.2E:22000:163:400=esl,254=esl:0:0:30194:1:1058:0
-No name;Digital+:11097:vC56:S19.2E:22000:167:108=esl:0:0:30064:1:1042:0
-PLAYIN'TV;DIGITAL+:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30197:1:1058:0
-RADIOS;DIGITAL+:10847:vC56:S19.2E:22000:163:400=eng,262,257,260,256,258,259,261,268,269,263,267,265,266,264:0:0:30102:1:1058:0
-TAQUILLA;DIGITAL+:10847:vC56:S19.2E:22000:163+8191:400=esl,254=eng:0:0:30128:1:1058:0
-TAQUILLA;Digital+:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30130:1:1058:0
-TEST T�CNICO;DIGITAL+:10847:vC56:S19.2E:22000:0:0:0:0:30173:1:1058:0
-TEST_CSD10;DIGITAL+:10847:vC56:S19.2E:22000:163:0:0:0:30183:1:1058:0
-TEST_CSD1;DIGITAL+:10847:vC56:S19.2E:22000:163:0:0:0:30174:1:1058:0
-TEST_CSD2;DIGITAL+:10847:vC56:S19.2E:22000:163:400=esl,239,240:0:100,1801:30175:1:1058:0
-TEST_CSD3;DIGITAL+:10847:vC56:S19.2E:22000:163:0:0:0:30176:1:1058:0
-TEST_CSD4;DIGITAL+:10847:vC56:S19.2E:22000:163:400=esl,254=eng:0:0:30177:1:1058:0
-TEST_CSD5;DIGITAL+:10847:vC56:S19.2E:22000:161:84=esl:0:0:30178:1:1058:0
-TEST_CSD6;DIGITAL+:10847:vC56:S19.2E:22000:163:0:0:0:30179:1:1058:0
-TEST_CSD7;DIGITAL+:10847:vC56:S19.2E:22000:163:0:0:0:30180:1:1058:0
-TEST_CSD8;DIGITAL+:10847:vC56:S19.2E:22000:163:0:0:0:30181:1:1058:0
-TEST_CSD9;DIGITAL+:10847:vC56:S19.2E:22000:163:0:0:0:30182:1:1058:0
-TM SAT/LAOTRA;DIGITAL+:11686:vC56:S19.2E:22000:164:96=esl:44:0:30204:1:1032:0
-TV GALICIA;DIGITAL+:11686:vC56:S19.2E:22000:167:108=glg:53:0:30222:1:1032:0
-CANAL ODISEA;Digital+:11318:vC56:S19.2E:22000:160:80=esl,81=por:0:100,1810:29800:1:1008:0
-CARACOL TV;digital TV:10818:vC56:S19.2E:22000:164:96=esl:0:100,1810:29962:1:1056:0
-ECUAVISA INT;Digital+:10818:vC56:S19.2E:22000:173:132=esl:0:100,1810:29961:1:1056:0
-FAMA 24H;DIGITAL+:11686:vC56:S19.2E:22000:170:120=esl:0:100,1810:30215:1:1032:0
-INTERECON TV;DIGITAL:11318:vC56:S19.2E:22000:171:124=esl:0:100,1810:29813:1:1008:0
-M�SICA DIGITAL;DIGITAL+:10847:vC56:S19.2E:22000:163:400=eng,233,234,235,236,237,238,239,240,241:0:100,1810:30100:1:1058:0
-PRO TV INT;DIGITAL+:11686:vC56:S19.2E:22000:172:128=ron:0:100,1810:30211:1:1032:0
-R. MADRID TV;Digital+:11156:vC56:S19.2E:22000:171:124=esl:0:100,1810:30513:1:1046:0
-RAD. LATINAS;Digital+:10847:vC56:S19.2E:22000:163:400=esl,270,271,272,273,274,275:0:100,1810:30124:1:1058:0
-RAD. ROMANIA;DIGITAL+:11686:vC56:S19.2E:22000:0:129:0:100,1810:30212:1:1032:0
-SCI FI;DIGITAL +:10818:vC56:S19.2E:22000:171:124=esl,125=eng:65:100,1810:29958:1:1056:0
-TELEFE INT;DIGITAL+:11436:vC56:S19.2E:22000:166:104=esl:0:100,1810:29901:1:1016:0
-:->TV Polonia
-Belsat TV;TVP:10773:hC56:S19.2E:22000:512:650=bel:0:0:17100:1:1053:0
-TV Polonia;TVP:10773:hC56:S19.2E:22000:514:670=pol;671=pol:578:0:17102:1:1053:0
-TV TRWAM;TVP:10773:hC56:S19.2E:22000:513:660=pol:0:0:17101:1:1053:0
-TVP Historia;TVP:10773:hC56:S19.2E:22000:515:680=pol:0:0:17103:1:1053:0
-TVP Kultura;TVP:10773:hC56:S19.2E:22000:516:690=pol:580:0:17104:1:1053:0
-TVP Info;TVP:10862:hC56:S19.2E:22000:515+8190:680=pol:579:9D0:7104:1:1059:0
-TVP1;TVP:10862:hC56:S19.2E:22000:512+8190:650=pol:576:9D0:7102:1:1059:0
-TVP2;TVP:10862:hC56:S19.2E:22000:513+8190:660=pol:577:9D0:7103:1:1059:0
-:->UPC Direct
-CT24,CT24;UPC Direct:12382:hC34:S19.2E:27500:151:161=cze:170:0:20316:1:1099:0
-Games Portal;UPC Direct:12304:hC34:S19.2E:27500:0:0:0:D02,1815:20498:1:1095:0
-Guide;UPC Direct:12304:hC34:S19.2E:27500:0:0:0:0:20500:1:1095:0
-TV Budapest,TV Budapest;UPC Direct:11671:hC56:S19.2E:22000:301:310=hun:0:0:20358:1:1031:0
-UPC Direct Radio;UPC Direct:12304:hC34:S19.2E:27500:0:0:0:0:20494:1:1095:0
-UPC_EPG;UPC Direct:12304:hC34:S19.2E:27500:0:0:0:0:20499:1:1095:0
-Animal Planet,AnimalPl;UPC Direct:12304:hC34:S19.2E:27500:151:160=hun,161=cze,162=eng:0:D02,1815:20302:1:1095:0
-AXN,AXN;UPC Direct:10921:hC56:S19.2E:22000:651:660=hun,661=cze,662=eng:0:D02,1815:20352:1:1063:0
-bebe tv,bebe tv;UPC Direct:10921:hC56:S19.2E:22000:551:564=slv:0:D02,1815:20350:1:1063:0
-Boomerang,Boomerang;UPC Direct:10921:hC56:S19.2E:22000:201:210=hun,212=eng,213=pol:220:D02,1815,100:20343:1:1063:0
-Cartoon Network/TCM,Cartoon Network/TCM;UPC Direct:10921:hC56:S19.2E:22000:101:110=hun,112=eng:120:D02,1815:20341:1:1063:0
-Cinemax,Cinemax;UPC Direct:11671:hC56:S19.2E:22000:251:260=hun,261=cze,262=eng:0:D02,1815:20357:1:1031:0
-Cool,Cool;UPC Direct:11992:hC34:S19.2E:27500:451:460=hun:0:D02,1815:20334:1:1279:0
-CT1,CT1;UPC Direct:12382:hC34:S19.2E:27500:101:111=cze:120:D02,1815:20315:1:1099:0
-CT2,CT2;UPC Direct:12382:hC34:S19.2E:27500:251:261=cze:270:D02,1815:20318:1:1099:0
-Discovery CE,Disc;UPC Direct:12304:hC34:S19.2E:27500:201:210=hun,211=cze,212=eng:0:D02,1815:20303:1:1095:0
-DOQ;UPC Direct:12382:hC34:S19.2E:27500:551:560=hun:0:D02:20324:1:1099:0
-Duna TV,Duna TV;UPC Direct:11992:hC34:S19.2E:27500:301:310=hun:320:D02,1815:20331:1:1279:0
-Echo TV,Echo TV;UPC Direct:11992:hC34:S19.2E:27500:101:110=hun:0:D02,1815:20327:1:1279:0
-Film+,Film+;UPC Direct:11671:hC56:S19.2E:22000:501:511=cze:0:D02,1815:20362:1:1031:0
-Film+,Film+;UPC Direct:11992:hC34:S19.2E:27500:751:760=hun:0:D02,1815:20340:1:1279:0
-Filmmuzeum,Filmmuzeum;UPC Direct:12382:hC34:S19.2E:27500:601:610=hun:0:D02,1815:20325:1:1099:0
-Hallmark,Hall;UPC Direct:12304:hC34:S19.2E:27500:451:460=hun,461=cze,462=eng:0:D02,1815:20308:1:1095:0
-HBO Comedy,HBO Comedy;UPC Direct:12304:hC34:S19.2E:27500:401:410=hun,411=cze,412=eng:420:D02,1815:20307:1:1095:0
-HBO2,HBO2;UPC Direct:11992:hC34:S19.2E:27500:151:160=hun,161=cze,162=eng,163=eng:170:D02,1815:20328:1:1279:0
-HBO,HBO;UPC Direct:11992:hC34:S19.2E:27500:201:210=hun,212=eng;219=hun:220:D02,1815:20329:1:1279:0
-HBO,HBO;UPC Direct:11992:hC34:S19.2E:27500:251:261=cze,262=eng;269=cze:0:D02,1815:20330:1:1279:0
-HirTV,HirTV;UPC Direct:11671:hC56:S19.2E:22000:101:110=hun:120:D02,1815:20354:1:1031:0
-Jetix/Jetix Max,Jetix/Jetix Max;UPC Direct:12304:hC34:S19.2E:27500:301:310=hun,311=cze,312=eng:0:D02,1815:20305:1:1095:0
-JimJam,JimJam;UPC Direct:12304:hC34:S19.2E:27500:251:260=hun,261=cze,262=eng,265=dut:0:D02,1815:20304:1:1095:0
-M1,M1;UPC Direct:11671:hC56:S19.2E:22000:151:160=hun:170:D02,1815:20355:1:1031:0
-m2,m2;UPC Direct:11992:hC34:S19.2E:27500:601:610=hun:620:D02,1815:20337:1:1279:0
-Magyar ATV,Magyar ATV;UPC Direct:11992:hC34:S19.2E:27500:401:410=hun:420:D02,1815:20333:1:1279:0
-MGM,MGM;UPC Direct:10921:hC56:S19.2E:22000:501:510=hun,511=cze,512=eng:0:D02,1815:20349:1:1063:0
-Minimax / Animax,Minimax / Animax;UPC Direct:11992:hC34:S19.2E:27500:651:660=hun,661=cze:0:D02,1815:20338:1:1279:0
-Nat Geo,NatGeo;UPC Direct:12304:hC34:S19.2E:27500:351:360=hun,362=eng,363=pol:370:D02,1815:20306:1:1095:0
-NOVA Cinema,NOVA Cinema;UPC Direct:12382:hC34:S19.2E:27500:201:211=cze:0:D02,1815:20317:1:1099:0
-Prima TV,Prima TV;UPC Direct:12382:hC34:S19.2E:27500:501:511=cze:520:D02,1815:20323:1:1099:0
-RTL Klub,RTL Klub;UPC Direct:11671:hC56:S19.2E:22000:351:360=hun:370:D02,1815:20359:1:1031:0
-Spektrum Int,Spektrum Int;UPC Direct:11671:hC56:S19.2E:22000:401:410=hun,411=cze:420:D02,1815:20360:1:1031:0
-STV1,STV1;UPC Direct:10921:hC56:S19.2E:22000:351:364=slv:370:D02,1815:20346:1:1063:0
-TA3,TA3;UPC Direct:10921:hC56:S19.2E:22000:401:414=slv:0:D02,1815:20347:1:1063:0
-Travel,Travel;UPC Direct:10921:hC56:S19.2E:22000:451:459=eng,460=hun,461=cze:470:D02,1815:20348:1:1063:0
-TV Deko,TV Deko;UPC Direct:11992:hC34:S19.2E:27500:501:510=hun,511=cze:0:D02,1815:20335:1:1279:0
-TV JOJ,TV JOJ;UPC Direct:12382:hC34:S19.2E:27500:351:364=slv:370:D02,1815:20320:1:1099:0
-TV Markiza,TV Markiza;UPC Direct:12382:hC34:S19.2E:27500:301:314=slv:320:D02,1815:20319:1:1099:0
-TV Nova,TV Nova;UPC Direct:12382:hC34:S19.2E:27500:401:411=cze:420:D02,1815:20321:1:1099:0
-TV Paprika,TV Paprika;UPC Direct:11992:hC34:S19.2E:27500:351:360=hun,361=cze:0:D02,1815:20332:1:1279:0
-TV2,TV2;UPC Direct:11671:hC56:S19.2E:22000:551:560=hun:570:D02,1815:20363:1:1031:0
-Viasat 3,Viasat 3;UPC Direct:10921:hC56:S19.2E:22000:151:160=hun:0:D02,1815:20342:1:1063:0
-Viasat Explorer,Viasat Explorer;UPC Direct:10921:hC56:S19.2E:22000:251:260=hun,261=cze,262=eng:270:D02,1815:20344:1:1063:0
-Viasat History,Viasat History;UPC Direct:10921:hC56:S19.2E:22000:301:310=hun,311=cze,312=eng:320:D02,1815:20345:1:1063:0
-Viva Hungary,Viva Hungary;UPC Direct:11671:hC56:S19.2E:22000:651:662=eng:670:D02,1815,D00:20365:1:1031:0
-XXX,XXX;UPC Direct:12382:hC34:S19.2E:27500:451:462=eng:470:D02,1815:20322:1:1099:0
-ZoneReality,Zone;UPC Direct:12304:hC34:S19.2E:27500:551:560=hun,561=cze,562=eng:570:D02,622,1815,100:20310:1:1095:0
-:->Schweinkram
-BLUE MOVIE:12070:hC34:S19.2E:27500:2047:2048=deu:0:1702,1830,1831,1722,1801,1810:665:133:1:0
-BLUE MOVIE Extra:12070:hC34:S19.2E:27500:2303:2304=deu:0:1830,1702,1831,1801,1722,1810:666:133:1:0
-BLUE MOVIE Gay:12070:hC34:S19.2E:27500:2815:2816=deu:0:1830,1722,1702,1831,1801:671:133:1:0
-Erotik 1:12070:hC34:S19.2E:27500:1535:1536=deu:0:1831,1830,1722,1801,1702:778:133:1:0
-Erotik 2:12070:hC34:S19.2E:27500:3327:3328=deu:0:1702,1831,1722,1830,1801:780:133:1:0
-eUrotic;Neterra:10832:hC56:S19.2E:22000:460+511:470:0:0:61997:1:1057:0
-TAQUILLA XX;TQX:11097:vC56:S19.2E:22000:164:96=esl:0:100,1810:30057:1:1042:0
-Top Girl Sex TV;BetaDigital:12246:vC34:S19.2E:27500:495:496=deu:0:0:10115:1:1092:0
-Hot Girls TV;BetaDigital:12246:vC34:S19.2E:27500:751:752=deu:0:0:10116:1:1092:0
-AbsolutSexy.TV;BetaDigital:12246:vC34:S19.2E:27500:2015:2016=deu:0:0:10156:1:1092:0
-SexyGirls.TV;BetaDigital:12246:vC34:S19.2E:27500:2527:2528=deu:0:0:10158:1:1092:0
-EroticDome;BetaDigital:12246:vC34:S19.2E:27500:3551:3552=deu:0:0:10162:1:1092:0
-Gratis Hot TV;BetaDigital:12246:vC34:S19.2E:27500:4063:4064=deu:0:0:10164:1:1092:0
-eUrotic NEU;Neterra:12552:vC56:S19.2E:22000:460+511:470:0:0:12123:1:1108:0
-SexySat;T-Systems:12633:hC56:S19.2E:22000:221:321=eng:0:0:12621:1:1113:0
-Rundum Sex TV;T-Systems:12633:hC56:S19.2E:22000:228:328:0:0:12628:1:1113:0
-PLAYBOY TV;Playboy TV:10877:vC56:S19.2E:22000:173:132=esl:0:100,1810:30603:1:1060:0
-TAQUILLA XX;TQXX:11097:vC56:S19.2E:22000:161:84=esl:0:100,1810:30058:1:1042:0
-PLAYBOY TV;CSAT:12207:vC34:S19.2E:27500:164:96=fra:0:0:8506:1:1090:0
-XXL;ABSAT:12285:v:S19.2E:27500:164:96:41:500,100:17024:1:1094:0
-Hustler TV,Hustler TV;UPC Direct:12304:hC34:S19.2E:27500:501:512=eng:0:D02,1815,100:20309:1:1095:0
-PRIVATE SPICE;CSAT:12324:vC34:S19.2E:27500:167:108=fra:0:500,100:8613:1:1096:0
-PRIVATE SPICE;CANALDIGITAAL:12344:hC34:S19.2E:27500:521+8190:120=dut:34:622,100:2040:53:1097:0
-XXL;CSAT:12610:vC56:S19.2E:22000:165:100=fra:0:500:9606:1:1112:0
-TAQUILLA XY;TXY:10788:vC56:S19.2E:22000:160:80=esl:0:100,1810:30357:1:1054:0
-:->CANALSATELLITE
-2M Maroc;CANALSATELLITE:11568:vC56:S19.2E:22000:139:140=ara:0:0:9030:1:1024:0
-Al Masriya;CANALSATELLITE:11568:vC56:S19.2E:22000:163:104=ara:0:0:9014:1:1024:0
-ARTE;CANALSATELLITE:11568:vC56:S19.2E:22000:167:136=fra,137=deu:71:0:9019:1:1024:0
-CANAL ALGERIE;CANALSATELLITE:11568:vC56:S19.2E:22000:168:138:0:0:9011:1:1024:0
-RAI 1;CANALSATELLITE:11568:vC56:S19.2E:22000:289:290=ita:291:0:9015:1:1024:0
-RTPI;CANALSATELLITE:11568:vC56:S19.2E:22000:161:301=por:302:0:9017:1:1024:0
-TV5MONDE;CANALSATELLITE:11568:vC56:S19.2E:22000:164:112=fra:60:0:9012:1:1024:0
-TV7;CANALSATELLITE:11568:vC56:S19.2E:22000:166:128=ara:0:0:9018:1:1024:0
-TVEi;CANALSATELLITE:11568:vC56:S19.2E:22000:58:59:61:0:9022:1:1024:0
-:->SES ASTRA
-!Kanal Telemedial;SES ASTRA:12552:vC56:S19.2E:22000:305:306=deu:0:0:3995:1:1108:0
-Astra Vision;SES ASTRA:12552:vC56:S19.2E:22000:168:144=ltz,146=fra:74:0:3997:1:1108:0
-STB Comag;SES ASTRA:12604:hC56:S19.2E:22000:0:0:0:0:7266:1:1111:0
-:->BBC_and_ITV
-BBC Prime,BBC Prime;UPC Direct:10921:hC56:S19.2E:22000:601:612=eng:620:D02,622,1815,100:20351:1:1063:0
-:->AB_SAT_Astra
-LCP;ABSAT:12285:v:S19.2E:27500:167:108:53:0:17027:1:1094:0
-LCP;ABSAT:12285:v:S19.2E:27500:167:108:53:0:17041:1:1094:0
-NT1;ABSAT:12285:v:S19.2E:27500:168:112:43:0:17028:1:1094:0
-NT1;ABSAT:12285:v:S19.2E:27500:168+8191:112:43:0:17040:1:1094:0
-AB MOTEURS;ABSAT:12285:v:S19.2E:27500:160:80=fra:41:500,100:17020:1:1094:0
-AB1;ABSAT:12285:v:S19.2E:27500:161:84:41:500,100:17021:1:1094:0
-ACTION;ABSAT:12285:v:S19.2E:27500:170:120:41:100:17030:1:1094:0
-ANIMAUX;ABSAT:12285:v:S19.2E:27500:162:88:41:100:17022:1:1094:0
-CINE FX;ABSAT:12285:v:S19.2E:27500:174:136:41:500,100:17034:1:1094:0
-CINE POLAR;ABSAT:12285:v:S19.2E:27500:173:132=deu:41:100:17033:1:1094:0
-ENCYCLOPEDIA;ABSAT:12285:v:S19.2E:27500:163:92:41:100:17023:1:1094:0
-ESCALES;ABSAT:12285:v:S19.2E:27500:165:100:41:500,100:17025:1:1094:0
-MANGAS;ABSAT:12285:v:S19.2E:27500:171:124:41:100:17031:1:1094:0
-RTL9;ABsat:12285:v:S19.2E:27500:175:140:41:100:17035:1:1094:0
-toute L'HISTOIRE;ABSAT:12285:v:S19.2E:27500:166:104:41:100:17026:1:1094:0
-:->ARD-Radio
-1LIVE diggi;ARD WDR:12265:hC34:S19.2E:27500:0:1161=deu:0:0:28481:1:1093:0
-1LIVE;ARD WDR:12265:hC34:S19.2E:27500:0:1101=deu:0:0:28475:1:1093:0
-Antenne Brandenburg;ARD rbb:12265:hC34:S19.2E:27500:0:821=deu:0:0:28454:1:1093:0
-B5 aktuell;ARD BR:12265:hC34:S19.2E:27500:0:141=deu:0:0:28404:1:1093:0
-B5 plus;ARD BR:12265:hC34:S19.2E:27500:0:181=deu:0:0:28408:1:1093:0
-BR Verkehr;ARD BR:12265:hC34:S19.2E:27500:0:171=deu:0:0:28407:1:1093:0
-Bayern 1;ARD BR:12265:hC34:S19.2E:27500:0:101=deu:0:0:28400:1:1093:0
-Bayern 2;ARD BR:12265:hC34:S19.2E:27500:0:111=deu:0:0:28401:1:1093:0
-Bayern 4 Klassik;ARD BR:12265:hC34:S19.2E:27500:0:131=deu;132=deu:0:0:28403:1:1093:0
-Bayern 4 Klassik;ARD:12109:hC34:S19.2E:27500:0:1301=deu:0:0:28213:1:1073:0
-Bayern Mobil;ARD BR:12265:hC34:S19.2E:27500:0:151=deu:0:0:28405:1:1093:0
-Bremen Eins;ARD RB:12265:hC34:S19.2E:27500:0:701=deu:0:0:28448:1:1093:0
-Bremen Vier;ARD RB:12265:hC34:S19.2E:27500:0:721=deu:0:0:28450:1:1093:0
-DASDING;ARD SWR:12265:hC34:S19.2E:27500:0:1061=deu:0:0:28471:1:1093:0
-InfoRadio;ARD rbb:12265:hC34:S19.2E:27500:0:801=deu:0:0:28452:1:1093:0
-MDR FIGARO;ARD MDR:12265:hC34:S19.2E:27500:0:531=deu:0:0:28431:1:1093:0
-MDR FIGARO;ARD:12109:hC34:S19.2E:27500:0:801=deu:0:0:28208:1:1073:0
-MDR INFO;ARD MDR:12265:hC34:S19.2E:27500:0:561=deu:0:0:28434:1:1093:0
-MDR INFO;ARD:12109:hC34:S19.2E:27500:0:1101=deu:0:0:28211:1:1073:0
-MDR JUMP;ARD MDR:12265:hC34:S19.2E:27500:0:541=deu:0:0:28432:1:1093:0
-MDR SPUTNIK;ARD MDR:12265:hC34:S19.2E:27500:0:551=deu:0:0:28433:1:1093:0
-MDR SPUTNIK;ARD:12109:hC34:S19.2E:27500:0:1201=deu:0:0:28212:1:1073:0
-MDR1 S-ANHALT;ARD MDR:12265:hC34:S19.2E:27500:0:511=deu:0:0:28429:1:1093:0
-MDR1 SACHSEN;ARD MDR:12265:hC34:S19.2E:27500:0:501=deu:0:0:28428:1:1093:0
-MDR1 TH�RINGEN;ARD MDR:12265:hC34:S19.2E:27500:0:521=deu:0:0:28430:1:1093:0
-MEHRKANALTEST;ARD:12421:hC34:S19.2E:27500:0:2001=deu;2002=deu:0:0:28397:1:1201:0
-NDR 1 Niedersachsen;ARD NDR:12265:hC34:S19.2E:27500:0:671=deu:0:0:28444:1:1093:0
-NDR 1 Radio MV;ARD NDR:12265:hC34:S19.2E:27500:0:661=deu:0:0:28443:1:1093:0
-NDR 1 Welle Nord;ARD NDR:12265:hC34:S19.2E:27500:0:651=deu:0:0:28442:1:1093:0
-NDR 2;ARD NDR:12265:hC34:S19.2E:27500:0:601=deu:0:0:28437:1:1093:0
-NDR 90,3;ARD NDR:12265:hC34:S19.2E:27500:0:641=deu:0:0:28441:1:1093:0
-NDR Info Spezial;ARD NDR:12265:hC34:S19.2E:27500:0:681=deu:0:0:28445:1:1093:0
-NDR Info;ARD NDR:12265:hC34:S19.2E:27500:0:621=deu:0:0:28439:1:1093:0
-NDR Kultur;ARD NDR:12265:hC34:S19.2E:27500:0:611=deu:0:0:28438:1:1093:0
-NDR Kultur;ARD:12109:hC34:S19.2E:27500:0:701=deu:2404:0:28207:1:1073:0
-Nordwestradio;ARD RB:12265:hC34:S19.2E:27500:0:711=deu:0:0:28449:1:1093:0
-SR1;ARD SR:12265:hC34:S19.2E:27500:0:901=deu:0:0:28461:1:1093:0
-SR2;ARD SR:12265:hC34:S19.2E:27500:0:911=deu:0:0:28462:1:1093:0
-SR3;ARD SR:12265:hC34:S19.2E:27500:0:921=deu:0:0:28463:1:1093:0
-SWR1 BW;ARD SWR:12265:hC34:S19.2E:27500:0:1001=deu:0:0:28465:1:1093:0
-SWR1 RP;ARD SWR:12265:hC34:S19.2E:27500:0:1011=deu:0:0:28466:1:1093:0
-SWR2;ARD SWR:12265:hC34:S19.2E:27500:0:1021=deu;1022=deu:0:0:28467:1:1093:0
-SWR2;ARD:12109:hC34:S19.2E:27500:0:1401=deu:0:0:28214:1:1073:0
-SWR4 BW;ARD SWR:12265:hC34:S19.2E:27500:0:1041=deu:0:0:28469:1:1093:0
-SWR4 RP;ARD SWR:12265:hC34:S19.2E:27500:0:1051=deu:0:0:28470:1:1093:0
-WDR 2 Klassik;ARD WDR:12265:hC34:S19.2E:27500:0:1171=deu:0:0:28482:1:1093:0
-WDR 2;ARD WDR:12265:hC34:S19.2E:27500:0:1111=deu:0:0:28476:1:1093:0
-WDR 3;ARD WDR:12265:hC34:S19.2E:27500:0:1121=deu;1122=deu:0:0:28477:1:1093:0
-WDR 3;ARD:12109:hC34:S19.2E:27500:0:1501=deu:0:0:28215:1:1073:0
-WDR 4;ARD WDR:12265:hC34:S19.2E:27500:0:1131=deu:0:0:28478:1:1093:0
-WDR 5;ARD WDR:12265:hC34:S19.2E:27500:0:1141=deu:0:0:28479:1:1093:0
-WDR 5;ARD:12109:hC34:S19.2E:27500:0:1601=deu:0:0:28216:1:1073:0
-WDR Event;ARD WDR:12265:hC34:S19.2E:27500:0:1181=deu:0:0:28483:1:1093:0
-WDR Funkhaus Europa;ARD WDR:12265:hC34:S19.2E:27500:0:1151=deu:0:0:28480:1:1093:0
-YOU FM;ARD HR:12265:hC34:S19.2E:27500:0:451=deu:0:0:28423:1:1093:0
-cont.ra;ARD SWR:12265:hC34:S19.2E:27500:0:1071=deu:0:0:28472:1:1093:0
-hr iNFO +;ARD HR:12265:hC34:S19.2E:27500:0:471=deu:0:0:28425:1:1093:0
-hr iNFO;ARD HR:12265:hC34:S19.2E:27500:0:461=deu:0:0:28424:1:1093:0
-hr1;ARD HR:12265:hC34:S19.2E:27500:0:401=deu:0:0:28419:1:1093:0
-hr2;ARD HR:12265:hC34:S19.2E:27500:0:411=deu;412=deu:0:0:28420:1:1093:0
-hr2;ARD:12109:hC34:S19.2E:27500:0:1001=deu:0:0:28210:1:1073:0
-hr4;ARD HR:12265:hC34:S19.2E:27500:0:431=deu:0:0:28422:1:1093:0
-kulturradio;ARD rbb:12265:hC34:S19.2E:27500:0:811=deu:0:0:28453:1:1093:0
-radioBERLIN 88,8;ARD rbb:12265:hC34:S19.2E:27500:0:831=deu:0:0:28455:1:1093:0
-radioeins;ARD rbb:12265:hC34:S19.2E:27500:0:841=deu:0:0:28456:1:1093:0
-radiomultikulti;ARD rbb:12265:hC34:S19.2E:27500:0:861=deu:0:0:28458:1:1093:0
-:->CanalDigitaal_Radio
-CAZ!;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:222=dut:0:0:5050:53:1109:0
-Classic FM;CANALDIGITAAL:12515:hC56:S19.2E:22000:0:118=dut:0:622,100:4040:53:1105:0
-FunX;CANALDIGITAAL:12515:hC56:S19.2E:22000:0:120=dut:0:0:4035:53:1105:0
-Juize.FM;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:229=dut:0:0:5071:53:1109:0
-KINK FM;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:220=dut:0:0:5055:53:1109:0
-NL-3FM;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:233=dut:0:622,100:5033:53:1109:0
-NL-Radio 1;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:231=dut:0:0:5031:53:1109:0
-NL-Radio 2;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:232=dut:0:622,100:5032:53:1109:0
-NL-Radio 4;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:234=dut:0:622,100:5034:53:1109:0
-NL-Radio 5;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:235=dut:0:0:5035:53:1109:0
-NL-Radio 6;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:228=dut:0:0:5080:53:1109:0
-Q-Music;CANALDIGITAAL:12515:hC56:S19.2E:22000:0:114=dut:0:622,100:4045:53:1105:0
-R538 Dance Department;CANALDIGITAAL:12515:hC56:S19.2E:22000:0:126=dut:0:0:4030:53:1105:0
-RNW1;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:225=dut:0:0:5060:53:1109:0
-RNW2;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:226=dut:0:0:5061:53:1109:0
-RNW3;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:240=dut:0:0:5062:53:1109:0
-RTL RADIO;CANALDIGITAAL:12344:hC34:S19.2E:27500:0:104=deu:0:0:2051:53:1097:0
-RVi1 (VRT);CANALDIGITAAL:12344:hC34:S19.2E:27500:0:100=dut:0:0:2070:53:1097:0
-RVi2 (VRT);CANALDIGITAAL:12344:hC34:S19.2E:27500:0:101=dut:0:0:2075:53:1097:0
-Radio Veronica;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:239=dut:0:0:5095:53:1109:0
-Radio10Gold;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:236=dut:0:0:5085:53:1109:0
-Radio538;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:230=dut:0:0:5072:53:1109:0
-Sky Radio;CANALDIGITAAL:12574:hC56:S19.2E:22000:0:227=dut:0:0:5070:53:1109:0
-:->Radio_Vlaanderen
-4FM;TV Vlaanderen:12670:vC56:S19.2E:22000:0:937:0:100:12787:53:1116:0
-4FM;TV Vlaanderen:12722:hC56:S19.2E:22000:0:937:0:100:12787:53:1119:0
-Donna;TV Vlaanderen:12670:vC56:S19.2E:22000:0:930=dut:0:622,100:12780:53:1116:0
-Donna;TV Vlaanderen:12722:hC56:S19.2E:22000:0:930=dut:0:622,100:12780:53:1119:0
-Klara;TV Vlaanderen:12670:vC56:S19.2E:22000:0:932=dut:0:622,100:12782:53:1116:0
-Klara;TV Vlaanderen:12722:hC56:S19.2E:22000:0:932=dut:0:622,100:12782:53:1119:0
-Q-music;TV Vlaanderen:12670:vC56:S19.2E:22000:0:936=dut:0:100:12786:53:1116:0
-Q-music;TV Vlaanderen:12722:hC56:S19.2E:22000:0:936=dut:0:100:12786:53:1119:0
-Radio 1;TV Vlaanderen:12670:vC56:S19.2E:22000:0:928=dut:0:622,100:12778:53:1116:0
-Radio 1;TV Vlaanderen:12722:hC56:S19.2E:22000:0:928=dut:0:622,100:12778:53:1119:0
-Radio 2;TV Vlaanderen:12670:vC56:S19.2E:22000:0:929=dut:0:622,100:12779:53:1116:0
-Radio 2;TV Vlaanderen:12722:hC56:S19.2E:22000:0:929=dut:0:622,100:12779:53:1119:0
-Studio Brussel;TV Vlaanderen:12670:vC56:S19.2E:22000:0:931=dut:0:622,100:12781:53:1116:0
-Studio Brussel;TV Vlaanderen:12722:hC56:S19.2E:22000:0:931=dut:0:622,100:12781:53:1119:0
-:->ORF_Radio
-FM4;ORF:12663:hC56:S19.2E:22000:0:434=deu:0:0:13134:1:1115:0
-OE1 DD;ORF:12663:hC56:S19.2E:22000:0:0;422=deu:0:0:13122:1:1115:0
-OE1;ORF:12663:hC56:S19.2E:22000:0:421=deu:0:0:13121:1:1115:0
-OE2 B;ORF:12663:hC56:S19.2E:22000:0:425=deu:0:0:13125:1:1115:0
-OE2 K;ORF:12663:hC56:S19.2E:22000:0:431=deu:0:0:13131:1:1115:0
-OE2 N;ORF:12663:hC56:S19.2E:22000:0:424=deu:0:0:13124:1:1115:0
-OE2 O;ORF:12663:hC56:S19.2E:22000:0:426=deu:0:0:13126:1:1115:0
-OE2 S;ORF:12663:hC56:S19.2E:22000:0:427=deu:0:0:13127:1:1115:0
-OE2 St;ORF:12663:hC56:S19.2E:22000:0:430=deu:0:0:13130:1:1115:0
-OE2 T;ORF:12663:hC56:S19.2E:22000:0:428=deu:0:0:13128:1:1115:0
-OE2 V;ORF:12663:hC56:S19.2E:22000:0:429=deu:0:0:13129:1:1115:0
-OE2 W;ORF:12663:hC56:S19.2E:22000:0:423=deu:0:0:13123:1:1115:0
-�1 International;ORF:12663:hC56:S19.2E:22000:0:435=deu:0:0:13135:1:1115:0
-:->PREMIERE_Radio
-P-60ER/70ER;PREMIERE:12070:hC34:S19.2E:27500:0:320=deu:0:B00,1831,1830,1801,1722,1702,D05:153:133:1:0
-P-80ER/90ER;PREMIERE:12070:hC34:S19.2E:27500:0:336=deu:0:1830,1702,1831,1722,B00,1801,D05:154:133:1:0
-P-COUNTRY,P-COUNT;PREMIERE:12070:hC34:S19.2E:27500:0:368=deu:0:1830,1722,1831,1702,D05,B00,1801:156:133:1:0
-P-DEUTSCHE CHARTS,P-D CHARTS;PREMIERE:12070:hC34:S19.2E:27500:0:272=deu:0:1831,1702,1722,1830,1801,D05,B00:150:133:1:0
-P-LOVE SONGS,P-LOVE;PREMIERE:12070:hC34:S19.2E:27500:0:304=deu:0:1830,1722,1831,1702,1801,B00,D05:152:133:1:0
-P-ROCK HYMNEN,P-ROCK;PREMIERE:12070:hC34:S19.2E:27500:0:288=deu:0:1830,1722,1831,1702,D05,1801,B00:151:133:1:0
-P-RnB/HIP HOP,P-RnB;PREMIERE:12070:hC34:S19.2E:27500:0:352=deu:0:1831,1722,1702,1830,1801,B00,D05:155:133:1:0
-:->TechniSat_Radio
-Euroklassik 1;TechniSat:12604:hC56:S19.2E:22000:0:5004:0:B00:6004:1:1111:0
-Jazz Time;TechniSat:12604:hC56:S19.2E:22000:0:5016:0:B00:6016:1:1111:0
-Kinderradio 1/ Konzertsaal 1;TechniSat:12604:hC56:S19.2E:22000:0:5011:0:B00:6011:1:1111:0
-RADIOROPA-BERLIN;TechniSat:12604:hC56:S19.2E:22000:0:5015:0:0:6015:1:1111:0
-RADIOROPA-H�rbuch 1;TechniSat:12604:hC56:S19.2E:22000:0:5012:0:B00:6012:1:1111:0
-RADIOROPA-H�rbuch 2;TechniSat:12604:hC56:S19.2E:22000:0:5002:0:B00:6002:1:1111:0
-RADIOROPA-H�rbuch 3;TechniSat:12604:hC56:S19.2E:22000:0:5013:0:B00:6013:1:1111:0
-RADIOROPA-H�rbuch 4;TechniSat:12604:hC56:S19.2E:22000:0:5019:0:B00:6019:1:1111:0
-Radio Swiss Classic;TechniSat:12604:hC56:S19.2E:22000:0:5009:0:B00:6009:1:1111:0
-Radio Swiss Jazz;TechniSat:12604:hC56:S19.2E:22000:0:5001:0:B00:6001:1:1111:0
-Radio Swiss Pop;TechniSat:12604:hC56:S19.2E:22000:0:5003:0:B00:6003:1:1111:0
-Radio Viola;TechniSat:12604:hC56:S19.2E:22000:0:5005:0:B00:6005:1:1111:0
-Star*Sat Country;TechniSat:12604:hC56:S19.2E:22000:0:5007:0:B00:6007:1:1111:0
-Star*Sat EASYTI;TechniSat:12604:hC56:S19.2E:22000:0:5010:0:B00:6010:1:1111:0
-Star*Sat Gold;TechniSat:12604:hC56:S19.2E:22000:0:5006:0:B00:6006:1:1111:0
-Star*Sat Hit-Express;TechniSat:12604:hC56:S19.2E:22000:0:5008:0:B00:6008:1:1111:0
-Star*Sat Klassik;TechniSat:12604:hC56:S19.2E:22000:0:5017:0:B00:6017:1:1111:0
-Star*Sat Melodie;TechniSat:12604:hC56:S19.2E:22000:0:5014:0:B00:6014:1:1111:0
-:->CSAT_Radio
-ADO;CSAT:12207:vC34:S19.2E:27500:0:253:0:0:8552:1:1090:0
-ALOUETTE;CSAT:12207:vC34:S19.2E:27500:0:250:0:0:8549:1:1090:0
-BBC ARABIC;CSAT:12207:vC34:S19.2E:27500:0:1946:0:0:8559:1:1090:0
-BBCW SERVICE;CSAT:12207:vC34:S19.2E:27500:0:1951:0:0:8565:1:1090:0
-BEUR FM;CSAT:12207:vC34:S19.2E:27500:0:1945:0:0:8558:1:1090:0
-BFM;CSAT:12207:vC34:S19.2E:27500:0:1918:0:0:8534:1:1090:0
-CANALSAT RADIOS;CSAT:12207:vC34:S19.2E:27500:0:236:0:0:8507:1:1090:0
-CHERIE FM;CSAT:12207:vC34:S19.2E:27500:0:249:0:0:8548:1:1090:0
-CONTACT FM;CSAT:12207:vC34:S19.2E:27500:0:245:0:0:8545:1:1090:0
-COULEUR 3;CSAT:12207:vC34:S19.2E:27500:0:1948:0:0:8553:1:1090:0
-EUROPE 1;CSAT:12207:vC34:S19.2E:27500:0:1911:0:0:8526:1:1090:0
-FIP;CSAT:12207:vC34:S19.2E:27500:0:1903:0:0:8520:1:1090:0
-FRANCE BLEU IDF;CSAT:12207:vC34:S19.2E:27500:0:1907:0:0:8523:1:1090:0
-FRANCE MUSIQUE;CSAT:12207:vC34:S19.2E:27500:0:1901:0:0:8519:1:1090:0
-FREQUENCE JAZZ;CSAT:12207:vC34:S19.2E:27500:0:254:0:0:8535:1:1090:0
-FUN RADIO;CSAT:12207:vC34:S19.2E:27500:0:240:0:0:8540:1:1090:0
-France CULTURE;CSAT:12207:vC34:S19.2E:27500:0:1906:0:0:8563:1:1090:0
-France INFO;CSAT:12207:vC34:S19.2E:27500:0:1904:0:0:8521:1:1090:0
-France INTER;CSAT:12207:vC34:S19.2E:27500:0:1905:0:0:8522:1:1090:0
-LE MOUV;CSAT:12207:vC34:S19.2E:27500:0:241:0:0:8541:1:1090:0
-MC DOUALIYA;CSAT:12207:vC34:S19.2E:27500:0:1915:0:0:8531:1:1090:0
-MEDI 1;CSAT:12207:vC34:S19.2E:27500:0:1949:0:0:8562:1:1090:0
-NOSTALGIE;CSAT:12207:vC34:S19.2E:27500:0:246:0:0:8533:1:1090:0
-NRJ;CSAT:12207:vC34:S19.2E:27500:0:236:0:0:8536:1:1090:0
-OUI FM;CSAT:12207:vC34:S19.2E:27500:0:252:0:0:8551:1:1090:0
-PARENTHESE RADIO;CSAT:12207:vC34:S19.2E:27500:0:1941:0:0:8554:1:1090:0
-RADIO ALPHA;CSAT:12207:vC34:S19.2E:27500:0:1943:0:0:8556:1:1090:0
-RADIO CLASSIQUE;CSAT:12207:vC34:S19.2E:27500:0:1909:0:0:8525:1:1090:0
-RADIO COURTOISIE;CSAT:12207:vC34:S19.2E:27500:0:1952:0:0:8566:1:1090:0
-RADIO FG;CSAT:12207:vC34:S19.2E:27500:0:243:0:0:8543:1:1090:0
-RADIO INT 2;CSAT:12207:vC34:S19.2E:27500:0:251,252,253,254,247,242,243,244,245,246,236,248,249,250,237,238,239,240,1928:0:0:8512:1:1090:0
-RADIO INT;CSAT:12207:vC34:S19.2E:27500:0:1920,1921,1922,1923,1924,1925,1926,1927,1908,1909,1910,1911,1912,1913,1914,1915,1918,1916,1917:0:0:8513:1:1090:0
-RADIO LATINA;CSAT:12207:vC34:S19.2E:27500:0:247:0:0:8546:1:1090:0
-RADIO NOTRE-DAME;CSAT:12207:vC34:S19.2E:27500:0:1942:0:0:8555:1:1090:0
-RADIO NOVA;CSAT:12207:vC34:S19.2E:27500:0:242:0:0:8542:1:1090:0
-RCJ / SHALOM;CSAT:12207:vC34:S19.2E:27500:0:1944:0:0:8557:1:1090:0
-RFI INT;CSAT:12207:vC34:S19.2E:27500:0:1908:0:0:8524:1:1090:0
-RFI MULTILINGUE;CSAT:12207:vC34:S19.2E:27500:0:1947:0:0:8560:1:1090:0
-RFM;CSAT:12207:vC34:S19.2E:27500:0:248:0:0:8547:1:1090:0
-RIRE & CHANSONS;CSAT:12207:vC34:S19.2E:27500:0:1913:0:0:8529:1:1090:0
-RMC;CSAT:12207:vC34:S19.2E:27500:0:1912:0:0:8527:1:1090:0
-RTL 2;CSAT:12207:vC34:S19.2E:27500:0:238:0:0:8538:1:1090:0
-RTL;CSAT:12207:vC34:S19.2E:27500:0:1910:0:0:8528:1:1090:0
-SKYROCK;CSAT:12207:vC34:S19.2E:27500:0:239:0:0:8539:1:1090:0
-SUD RADIO;CSAT:12207:vC34:S19.2E:27500:0:1914:0:0:8530:1:1090:0
-TSF;CSAT:12207:vC34:S19.2E:27500:0:1916:0:0:8532:1:1090:0
-VIBRATION;CSAT:12207:vC34:S19.2E:27500:0:244:0:0:8544:1:1090:0
-VIRGIN RADIO;CSAT:12207:vC34:S19.2E:27500:0:237:0:0:8537:1:1090:0
-VOLTAGE;CSAT:12207:vC34:S19.2E:27500:0:251:0:0:8550:1:1090:0
-WRN;CSAT:12207:vC34:S19.2E:27500:0:1932:0:0:8564:1:1090:0
-:->0192-10818_FTA_TV
-TVV INT.;CCV:10818:vC56:S19.2E:22000:169:116=esl:0:0:29954:1:1056:0
-:->0192-10832_FTA_TV
-Bibel TV;Bibel TV:10832:hC56:S19.2E:22000:32:33:49:0:61900:1:1057:0
-TV TRWAM;TV TRWAM:10832:hC56:S19.2E:22000:70:71:54:0:61911:1:1057:0
-RTBF SAT;RTBF:10832:hC56:S19.2E:22000:4194+4192:4195:4201:0:61998:1:1057:0
-:->0192-10847_FTA_TV
-No name;Contactanos:10847:vC56:S19.2E:22000:163:400=esl,254=esl:0:0:30195:1:1058:0
-:->0192-10979_FTA_TV
-CL�SICO;CLASIC:10979:vC56:S19.2E:22000:161:84=esl:0:100,1810:30651:1:1034:0
-24 HORAS;24H:10979:vC56:S19.2E:22000:162:88=esl:0:100,1810:30652:1:1034:0
-TNT;CMA30:10979:vC56:S19.2E:22000:163:92=esl,93=eng:41:100,1810:30653:1:1034:0
-24 HORAS;24H:10979:vC56:S19.2E:22000:162:88=esl:0:100,1810:30655:1:1034:0
-TELENOVELAS;TLNV:10979:vC56:S19.2E:22000:165:100=esl:0:100,1810:30656:1:1034:0
-HOLLYWOOD;HOLLYW:10979:vC56:S19.2E:22000:166:104=esl,105=eng:0:100,1810:30657:1:1034:0
-HISTORIA;HIST:10979:vC56:S19.2E:22000:167:108=esl,109=por:0:100,1810:30658:1:1034:0
-TELENOVELAS;TLNV:10979:vC56:S19.2E:22000:165:100=esl:0:100,1810:30659:1:1034:0
-TV CANARIA;CANAR:10979:vC56:S19.2E:22000:164:96=esl:0:0:30661:1:1034:0
-TNT;CMA30:10979:vC56:S19.2E:22000:163:92=esl,93=eng:41:100,1810:30665:1:1034:0
-:->0192-11097_FTA_TV
-C+ EVENTOS;CPD3:11097:vC56:S19.2E:22000:162:88=esl:0:100,1810:30062:1:1042:0
-:->0192-11318_FTA_TV
-C+ ACCI�N;CPC1:11318:vC56:S19.2E:22000:162:88=esl,89=eng:38:100,1810:29810:1:1008:0
-C+ COMEDIA;CPC2:11318:vC56:S19.2E:22000:163:92=esl,93=eng:41:100,1810:29811:1:1008:0
-C+ DCINE;CPC3:11318:vC56:S19.2E:22000:170:120=esl,121=eng:62:100,1810:29812:1:1008:0
-:->0192-11436_FTA_TV
-PORTADA;ESCAP:11436:vC56:S19.2E:22000:171:124=esl:0:0:29902:1:1016:0
-:->0192-11509_FTA_TV
-DEMAIN TV;GlobeCast:11509:vC56:S19.2E:22000:704:724:0:0:7004:1:1020:0
-NRJ Paris;GCE:11509:vC56:S19.2E:22000:705:725:0:0:7005:1:1020:0
-POPULAR TV;OVERON:11509:vC56:S19.2E:22000:707:727:0:0:7007:1:1020:0
-CUBAVISION;GCE:11509:vC56:S19.2E:22000:708:728:0:0:7008:1:1020:0
-BFM TV;GLOBECAST:11509:vC56:S19.2E:22000:709:729:0:0:7009:1:1020:0
-REDERECORD;GCE:11509:vC56:S19.2E:22000:710:730:0:0:7010:1:1020:0
-ARIRANG TV;GlobeCast:11509:vC56:S19.2E:22000:711:731:0:0:7011:1:1020:0
-EXTREMADURA TV;OVERON:11509:vC56:S19.2E:22000:713:733:0:0:7013:1:1020:0
-BFM TV;OVERON:11509:vC56:S19.2E:22000:709:729:0:0:7019:1:1020:0
-:->0192-11538_FTA_TV
-DIRECT 8;GlobeCast:11538:vC56:S19.2E:22000:601:621:0:0:6901:1:1022:0
-KTO;OVERON:11538:vC56:S19.2E:22000:602:622:0:0:6902:1:1022:0
-EWTN Europe;OVERON:11538:vC56:S19.2E:22000:607:627,667,677,687:0:0:6907:1:1022:0
-ARAGON TV;OVERON:11538:vC56:S19.2E:22000:609:629:0:0:6909:1:1022:0
-DIRECT 8;OVERON:11538:vC56:S19.2E:22000:601:621:0:0:6911:1:1022:0
-TELESUR;GlobeCast Spain:11538:vC56:S19.2E:22000:612:632:0:0:6912:1:1022:0
-:->0192-11597_FTA_TV
-TV5MONDE EUROPE;TV5MONDE:11597:vC56:S19.2E:22000:45:46:3602:0:10060:1:1026:0
-:->0192-11686_FTA_TV
-TVC INT.;TVC:11686:vC56:S19.2E:22000:161:84=cat:35:0:30201:1:1032:0
-:->0192-11739_FTA_TV
-GAME ONE;MTV Networks Europe:11739:vC34:S19.2E:27500:3031+8190:3032=fra:0:100,D00,500:28663:1:1066:0
-:->0192-11778_FTA_TV
-Cartoon Network;TBS:11778:vC34:S19.2E:27500:161:84=fra,85=eng:35:D03,100,500:28521:1:1068:0
-Spare 28526;Arqiva:11778:vC34:S19.2E:27500:164:96=esl,97=eng:44:0:28526:1:1068:0
-:->0192-11973_FTA_TV
-VIVA Germany;MTV Networks Europe:11973:vC34:S19.2E:27500:4061+8190:4062:4064:0:28676:1:1078:0
-COMEDY CENTRAL Germany;MTV Networks Europe:11973:vC34:S19.2E:27500:4071+8190:4072:4074:0:28677:1:1078:0
-NICK Germany;MTV Networks Europe:11973:vC34:S19.2E:27500:4101+8190:4102=deu:4104:0:28680:1:1078:0
-:->0192-12051_FTA_TV
-PULS 4 Austria;ProSiebenSat.1:12051:vC34:S19.2E:27500:1791:1792=deu:39:0:20007:1:1082:0
-:->0192-12188_FTA_TV
-RTL HH SH;RTL World:12188:hC34:S19.2E:27500:163:104=deu:105:0:12004:1:1089:0
-RTL HB NDS;RTL World:12188:hC34:S19.2E:27500:163:104=deu:105:0:12005:1:1089:0
-:->0192-12226_FTA_TV
-NICK AUSTRIA;MTV Networks:12226:hC34:S19.2E:27500:513:661=deu:577:0:28640:1:1091:0
-:->0192-12304_FTA_TV
-Game 3;chellomedia IS:12304:hC34:S19.2E:27500:0:0:0:0:20495:1:1095:0
-Game 2;chellomedia IS:12304:hC34:S19.2E:27500:0:0:0:0:20496:1:1095:0
-Game 1;chellomedia IS:12304:hC34:S19.2E:27500:0:0:0:0:20497:1:1095:0
-:->0192-12545_FTA_TV
-9Live;ProSiebenSat.1:12545:hC56:S19.2E:22000:1279:1280=deu:36:0:17504:1:1107:0
-:->0192-12552_FTA_TV
-LUXE.TV SD;DVL.TV:12552:vC56:S19.2E:22000:98:4451=deu,4453=fra,4459=esl:0:0:3992:1:1108:0
-RTL Tele Letzebuerg:12552:vC56:S19.2E:22000:168:144=ltz,146=fra:301:0:3994:1:1108:0
-LibertyTV FR;LibertyTV.com:12552:vC56:S19.2E:22000:941:943=fra:0:0:12120:1:1108:0
-Medi1SAT;PRVDR:12552:vC56:S19.2E:22000:2050:2051=fra,2052=ara:0:0:12121:1:1108:0
-[tru|] young tv;Bibel TV:12552:vC56:S19.2E:22000:33:34=deu:0:0:12122:1:1108:0
-Bloomberg TV Germany;Bloomberg:12552:vC56:S19.2E:22000:162:99=deu:0:0:12160:1:1108:0
-Chamber TV;Chambre des D�put�es:12552:vC56:S19.2E:22000:55:56=ltz:0:0:12180:1:1108:0
-:->0192-12604_FTA_TV
-TechniTipp-TV;TechniSat:12604:hC56:S19.2E:22000:5018:6118=deu:0:0:6018:1:1111:0
-:->0192-12663_FTA_TV
-ALL FUN TV;-:12663:hC56:S19.2E:22000:1030:1031=deu:0:0:13103:1:1115:0
-INNSAT.TV;Innsat:12663:hC56:S19.2E:22000:1040:1041=deu:0:0:13104:1:1115:0
-Visit-X.TV;-:12663:hC56:S19.2E:22000:1070:1071=deu:0:0:13107:1:1115:0
-Spass im TV;-:12663:hC56:S19.2E:22000:1080:1081=deu:0:0:13108:1:1115:0
-AKTIV DIREKT TV;-:12663:hC56:S19.2E:22000:1050:1051=deu:0:0:13112:1:1115:0
-Kuren und Wellness;-:12663:hC56:S19.2E:22000:2130:2131=deu:0:0:13113:1:1115:0
-Uschi TV;StarSat:12663:hC56:S19.2E:22000:2140:2141=deu:0:0:13114:1:1115:0
-Uschi�s Schwestern;StarSat:12663:hC56:S19.2E:22000:2150:2151=deu:0:0:13115:1:1115:0
-Liebeskanal;StarSat:12663:hC56:S19.2E:22000:2160:2161=deu:0:0:13116:1:1115:0
-Weiber TV;StarSat:12663:hC56:S19.2E:22000:2170:2171=deu:0:0:13117:1:1115:0
-Liebesrundfunk;StarSat:12663:hC56:S19.2E:22000:2180:2181=deu:0:0:13118:1:1115:0
-Kurven-Reich;StarSat:12663:hC56:S19.2E:22000:2190:2191=deu:0:0:13119:1:1115:0
-Hei�e Nummer;StarSat:12663:hC56:S19.2E:22000:2200+2201:2201=deu:0:0:13120:1:1115:0
-Teles�nde;StarSat:12663:hC56:S19.2E:22000:2500:2501=deu:0:0:13150:1:1115:0
-Piep Show;StarSat:12663:hC56:S19.2E:22000:2510:2511=deu:0:0:13151:1:1115:0
-Flirtrepublik;StarSat:12663:hC56:S19.2E:22000:2520:2521=deu:0:0:13152:1:1115:0
-:->0192-10773__Radio
-Radio TEST;TVP:10773:hC56:S19.2E:22000:0:661=pol:0:0:17201:1:1053:0
-:->0192-10832__Radio
-Radio Maryja;Radio Maryja:10832:hC56:S19.2E:22000:0:73:0:0:61912:1:1057:0
-Radio Horeb;Eurociel:10832:hC56:S19.2E:22000:0:64=deu:0:0:61960:1:1057:0
-RDC;Polskie Radio-Regionalna:10832:hC56:S19.2E:22000:0:67=pol:0:0:61962:1:1057:0
-CFN/RFC;Canadian Forces Europe:10832:hC56:S19.2E:22000:0:58=eng:0:0:61994:1:1057:0
-Radio neue Hoffnung / Radio new Hope;RADIO Neue Hoffnung:10832:hC56:S19.2E:22000:0:59:0:0:61995:1:1057:0
-RTBF International;RTBF:10832:hC56:S19.2E:22000:0:4197:0:0:61999:1:1057:0
-:->0192-10847__Radio
-RADIOS ESP;DIGITAL+:10847:vC56:S19.2E:22000:0:400=eng,262,257,260,256,258,259,261,268,269,263,267,265,266,264:0:0:30104:1:1058:0
-:->0192-11538__Radio
-Radio Aragon;OVERON:11538:vC56:S19.2E:22000:0:630:0:0:6910:1:1022:0
-:->0192-11671__Radio
-Bartok Radio,Bartok Radio;UPC Direct:11671:hC56:S19.2E:22000:0:710=hun:0:D02,1815:20450:1:1031:0
-Petofi Radio,Petofi Radio;UPC Direct:11671:hC56:S19.2E:22000:0:760=hun:0:D02,1815:20451:1:1031:0
-Kossuth Radio,Kossuth Radio;UPC Direct:11671:hC56:S19.2E:22000:0:810=hun:0:D02,1815:20452:1:1031:0
-:->0192-11778__Radio
-CNN Radio;CNN:11778:vC34:S19.2E:27500:0:101=eng:0:0:28523:1:1068:0
-:->0192-11954__Radio
-Dok&Deb;ZDFvision:11954:hC34:S19.2E:27500:0:410=deu:0:0:28017:1:1079:0
-:->0192-12246__Radio
-DELUXE LOUNGE;BetaDigital:12246:vC34:S19.2E:27500:0:352=deu:0:0:10141:1:1092:0
-:->0192-12460__Radio
-OldieStar Radio,OldieStar;BetaDigital:12460:hC34:S19.2E:27500:0:352=deu:0:0:174:133:5:0
-:->0192-12633__Radio
-ffn digital;T-Systems:12633:hC56:S19.2E:22000:0:354=deu:0:0:12654:1:1113:0
-DefJay 100% R&B;T-Systems:12633:hC56:S19.2E:22000:0:355=deu:0:0:12655:1:1113:0
-WRN Deutsch;T-Systems:12633:hC56:S19.2E:22000:0:356=deu:0:0:12656:1:1113:0
-PEPPERMINT fm;T-Systems:12633:hC56:S19.2E:22000:0:357=deu:0:0:12657:1:1113:0
-ffn Comedy;T-Systems:12633:hC56:S19.2E:22000:0:358=deu:0:0:12658:1:1113:0
-:->0192-12663__Radio
-RADIO MARIA;Radio Maria �sterreich:12663:hC56:S19.2E:22000:0:440=deu:0:0:13140:1:1115:0
-:->0192-10788_CA_TV
-CARTOON NET.;CTN:10788:vC56:S19.2E:22000:161:84=esl,85=eng,86=aut:35:100,1810:30358:1:1054:0
-BOOMERANG;BOOM:10788:vC56:S19.2E:22000:163:92=esl,93=eng:0:100,1810:30361:1:1054:0
-:->0192-10818_CA_TV
-C+ ACCI�N...30;CMA:10818:vC56:S19.2E:22000:160:80=esl,81=eng:32:100,1810:29950:1:1056:0
-C+ COMEDIA...30;CMADOS:10818:vC56:S19.2E:22000:161:84=esl,85=eng:35:100,1810:29951:1:1056:0
-DCINE ESPA�OL;DCESP:10818:vC56:S19.2E:22000:167:108=esl:0:100,1810:29952:1:1056:0
-CANAL COCINA;CACOC:10818:vC56:S19.2E:22000:168:112=esl:0:100,1810:29953:1:1056:0
-FOX;FOXGE:10818:vC56:S19.2E:22000:165:100=esl,101=eng:47:100,1810:29955:1:1056:0
-AXN;AXN:10818:vC56:S19.2E:22000:166:104=esl,105=eng:50:100,1810:29956:1:1056:0
-TVE 1;TVE 1:10818:vC56:S19.2E:22000:170:120=esl,121=eng:0:100,1810:29957:1:1056:0
-:->0192-10862_CA_TV
-INT6;Telewizja Polska SA:10862:hC56:S19.2E:22000:517+8190:700=pol:0:9D0:7106:1:1059:0
-:->0192-10877_CA_TV
-40 LATINO;40LAT:10877:vC56:S19.2E:22000:165:100=esl:0:100,1810:30600:1:1060:0
-GOLF+;GOLF+:10877:vC56:S19.2E:22000:166:104=esl,105=eng:0:100,1810:30601:1:1060:0
-CANAL+...30;CP30:10877:vC56:S19.2E:22000:167:108=esl,109=eng:53:100,1810:30602:1:1060:0
-NAT GEOGRAPH;NATGEO:10877:vC56:S19.2E:22000:170:120=esl,121=eng:0:100,1810:30605:1:1060:0
-C+ F�TBOL;CPD1:10877:vC56:S19.2E:22000:161:84=esl:0:100,1810:30606:1:1060:0
-C+ DEPORTES;CPD2:10877:vC56:S19.2E:22000:172:128=esl:0:100,1810:30607:1:1060:0
-:->0192-11038_CA_TV
-CANAL+;CP:11038:vC56:S19.2E:22000:160:80=esl,81=eng:32:100,1810:30400:1:1038:0
-DOCU TVE;Docu TVE:11038:vC56:S19.2E:22000:161:84=esl:0:100,1810:30401:1:1038:0
-DISNEY CH.;DCH:11038:vC56:S19.2E:22000:163:92=esl,93=eng:41:100,1810:30403:1:1038:0
-40 TV;+MUS:11038:vC56:S19.2E:22000:165:100=esl:0:100,1810:30405:1:1038:0
-DISCOVERY;DCR:11038:vC56:S19.2E:22000:166:104=esl,105=por:0:100,1810:30406:1:1038:0
-CANAL+ 2;CP2:11038:vC56:S19.2E:22000:168:112=esl,113=eng:56:100,1810:30410:1:1038:0
-TELEDEPORTE;TDEP:11038:vC56:S19.2E:22000:170:120=esl:0:100,1810:30412:1:1038:0
-:->0192-11097_CA_TV
-BAR�A TV;BARNA:11097:vC56:S19.2E:22000:169:116=cat,117=esl:0:100,1810:30052:1:1042:0
-C+ EVENTOS;CPD3:11097:vC56:S19.2E:22000:162:88=esl:0:100,1810:30059:1:1042:0
-:->0192-11156_CA_TV
-PEOPLE+ARTS;P&A:11156:vC56:S19.2E:22000:165:100=esl,101=eng:0:100,1810:30504:1:1046:0
-VIAJAR;VJR:11156:vC56:S19.2E:22000:166:104=esl,105=eng:0:100,1810:30505:1:1046:0
-PAR. COMEDY;NC:11156:vC56:S19.2E:22000:167:108=esl,109=eng:0:100,1810:30506:1:1046:0
-CAZA Y PESCA;CAZPES:11156:vC56:S19.2E:22000:169:116=esl,117=eng:0:100,1810:30507:1:1046:0
-LA 2;La2:11156:vC56:S19.2E:22000:162:88=esl,89=eng:0:100,1810:30509:1:1046:0
-CALLE 13;CL13:11156:vC56:S19.2E:22000:163:92=esl,93=eng:41:100,1810:30510:1:1046:0
-BLOOMBERG;BL:11156:vC56:S19.2E:22000:161:84=esl:0:100,1810:30511:1:1046:0
-COSMOPOLITAN;COSMO:11156:vC56:S19.2E:22000:170:120=esl,121=eng:0:100,1810:30512:1:1046:0
-:->0192-11436_CA_TV
-TCM MODERNO;TCM:11436:vC56:S19.2E:22000:4240:4241=esl,4242=eng:4243:100,1810:29903:1:1016:0
-:->0192-11686_CA_TV
-C. ESTRELLAS;GALAV:11686:vC56:S19.2E:22000:168:112=esl:0:100,1810:30206:1:1032:0
-TCM CL�SICO;CMACLS:11686:vC56:S19.2E:22000:165:100=esl,101=eng:47:100,1810:30220:1:1032:0
-:->0192-11739_CA_TV
-Nick ESP;MTV Networks Europe:11739:vC34:S19.2E:27500:3101+8190:3102=esl,3103=eng:3104:D00,100,1810:28660:1:1066:0
-NICKELODEON France;MTV Networks Europe:11739:vC34:S19.2E:27500:3081+8190:3082=fra:3084:100,500,D00:28668:1:1066:0
-:->0192-11778_CA_TV
-Spare 2;TBS:11778:vC34:S19.2E:27500:167:113=deu:0:D03:28520:1:1068:0
-TCM;TBS:11778:vC34:S19.2E:27500:169:64=fra,65=eng:61:D03,100,500:28525:1:1068:0
-Boomerang;TBS:11778:vC34:S19.2E:27500:166:102=fra,103=eng:46:D03,100,500:28527:1:1068:0
-1.068 Spare;Arqiva:11778:vC34:S19.2E:27500:163:92=esl,93=eng:41:100:28605:1:1068:0
-TVBS;Chinese Channel LTD.:11778:vC34:S19.2E:27500:162:88=chi,89=mdr:38:100:28632:1:1068:0
-:->0192-11895_CA_TV
-M6;IMEDIA:11895:vC34:S19.2E:27500:163:92=fra:59:500,100:8367:1:1074:0
-:->0192-11973_CA_TV
-NICK PREMIUM (P);MTV Networks Europe:11973:vC34:S19.2E:27500:4121+8190:4122:0:D00,1702,1801,1830:28682:1:1078:0
-:->0192-12663_CA_TV
-AUSTRIA 9 TV;AUSTRIA 9 TV:12663:hC56:S19.2E:22000:1060:1061=deu:1063:D05:13106:1:1115:0
-Spieldaten:12032:hC34:S19.2E:27500:2303:2304=deu,2305=deu;2307=deu:32:1722,1831,1830,1801,1702:228:133:4:0
-Service 12;BetaDigital:12148:hC34:S19.2E:27500:0:0:0:0:71:133:7:0
-.;BetaDigital:12148:hC34:S19.2E:27500:0:0:0:0:770:133:7:0
-.;BetaDigital:12148:hC34:S19.2E:27500:0:0:0:0:771:133:7:0
-PFH:12148:hC34:S19.2E:27500:3327:3328=deu,3329=deu:0:1810:33:133:7:0
-Blue Hustler,Blue Hustler;UPC Direct:10921:hC56:S19.2E:22000:251:262=eng:0:D02,1815:20353:1:1063:0
-JETIX;PREMIERE:11758:hC34:S19.2E:27500:1279:1280=deu:32:B00,D05,1722,1830,1702,1831,1801:28:133:17:0
-JUNIOR,JUNIOR;PREMIERE:11758:hC34:S19.2E:27500:255:256=deu:32:1831,1830,1702,1722,D05,B00,1801:19:133:17:0
-.;BetaDigital:12460:hC34:S19.2E:27500:0:0:0:0:72:133:5:0
-.;BetaDigital:12460:hC34:S19.2E:27500:0:0:0:0:73:133:5:0
-.;BetaDigital:12460:hC34:S19.2E:27500:0:0:0:0:74:133:5:0
-.;BetaDigital:12460:hC34:S19.2E:27500:0:0:0:0:75:133:5:0
-IP4_slides;SES ASTRA:12604:hC56:S19.2E:22000:0:0:0:0:7245:1:1111:0
-40 LATINO;40LAT:10877:vC56:S19.2E:22000:165:100=esl:0:100,1810:30604:1:1060:0
-C+ F�TBOL;CPD1:10877:vC56:S19.2E:22000:161:84=esl:0:100,1810:30620:1:1060:0
-C+ DEPORTES;CPD2:10877:vC56:S19.2E:22000:172:128=esl:0:100,1810:30621:1:1060:0
-M�TEO;MET:11156:vC56:S19.2E:22000:164:96=esl:0:100,1810:30514:1:1046:0
-VIAJAR;VJR:11156:vC56:S19.2E:22000:166:104=esl,105=eng:0:100,1810:30516:1:1046:0
-JETIX;FK:11318:vC56:S19.2E:22000:161:84=esl:0:100,1810:29801:1:1008:0
-DISNEY CH. +1;DCH1:11318:vC56:S19.2E:22000:164:96=esl,97=eng:44:100,1810:29802:1:1008:0
-PLAYHOUSE;PLAYDC:11318:vC56:S19.2E:22000:165:100=esl,101=eng:47:100,1810:29803:1:1008:0
-C+ ACCI�N;CPC1:11318:vC56:S19.2E:22000:162:88=esl,89=eng:38:100,1810:29804:1:1008:0
-C+ COMEDIA;CPC2:11318:vC56:S19.2E:22000:163:92=esl,93=eng:41:100,1810:29805:1:1008:0
-C+ DCINE;CPC3:11318:vC56:S19.2E:22000:170:120=esl,121=eng:62:100,1810:29806:1:1008:0
-TOON DISNEY;TOONDC:11318:vC56:S19.2E:22000:169:116=esl,117=eng:59:100,1810:29807:1:1008:0
-ARTE:11568:vC56:S19.2E:22000:167:136=fra,137=deu:71:0:9023:1:1024:0
-TRT International:11568:vC56:S19.2E:22000:712+7192:713=tur:1122:0:9024:1:1024:0
-Test:11568:vC56:S19.2E:22000:601:602:0:0:9025:1:1024:0
-FOXLIFE;CSAT:11895:vC34:S19.2E:27500:0:0:0:0:8359:1:1074:0
-KIOSQUE;CSAT:12129:vC34:S19.2E:27500:0:0:0:0:8414:1:1086:0
-RCI SAT;CSAT:12207:vC34:S19.2E:27500:0:0:0:0:8561:1:1090:0
-.;BetaDigital:12246:vC34:S19.2E:27500:0:0:0:0:10108:1:1092:0
-.;BetaDigital:12246:vC34:S19.2E:27500:0:0:0:0:10128:1:1092:0
-.;BetaDigital:12246:vC34:S19.2E:27500:0:0:0:0:10131:1:1092:0
-.;BetaDigital:12246:vC34:S19.2E:27500:0:0:0:0:10168:1:1092:0
-.;BetaDigital:12246:vC34:S19.2E:27500:0:0:0:0:10170:1:1092:0
-.;BetaDigital:12246:vC34:S19.2E:27500:0:0:0:0:10171:1:1092:0
-.;BetaDigital:12246:vC34:S19.2E:27500:0:0:0:0:10172:1:1092:0
-APS.R12;BetaDigital:12246:vC34:S19.2E:27500:0:0:0:0:10143:1:1092:0
-APS.R13;BetaDigital:12246:vC34:S19.2E:27500:0:0:0:0:10144:1:1092:0
-APS.R14;BetaDigital:12246:vC34:S19.2E:27500:0:0:0:0:10145:1:1092:0
-APS.R15;BetaDigital:12246:vC34:S19.2E:27500:0:0:0:0:10146:1:1092:0
-CANAL+ HI-TECH HD;IMEDIA:12363:vC34:S19.2E:27500:2047+8191:0:0:0:9102:1:1098:0
-.;BetaDigital:12480:vC34:S19.2E:27500:0:0:0:0:76:133:33:0
-.;BetaDigital:12480:vC34:S19.2E:27500:0:0:0:0:77:133:33:0
diff --git a/config/vdr/etc/plugins/streamdevhosts.conf b/config/vdr/etc/plugins/streamdevhosts.conf
deleted file mode 100644
index 2bbd16b1c..000000000
--- a/config/vdr/etc/plugins/streamdevhosts.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-127.0.0.1
-10.0.0.0/8
-192.168.0.0/16
diff --git a/config/vdr/etc/setup.conf b/config/vdr/etc/setup.conf
deleted file mode 100644
index 749ad03c8..000000000
--- a/config/vdr/etc/setup.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-AntiAlias = 1
-AudioLanguages =
-ChannelEntryTimeout = 1000
-ChannelInfoPos = 0
-ChannelInfoTime = 5
-CurrentChannel = 907
-CurrentDolby = 0
-CurrentVolume = 255
-DefaultLifetime = 99
-DefaultPriority = 50
-DiSEqC = 0
-DisplaySubtitles = 0
-EmergencyExit = 1
-EPGBugfixLevel = 3
-EPGLanguages =
-EPGLinger = 0
-EPGScanTimeout = 5
-FontFix = Courier:Bold
-FontFixSize = 20
-FontOsd = Sans Serif:Bold
-FontOsdSize = 22
-FontSml = Sans Serif
-FontSmlSize = 18
-InitialChannel = 0
-InitialVolume = -1
-InstantRecordTime = 180
-LnbFrequHi = 10600
-LnbFrequLo = 9750
-LnbSLOF = 11700
-MarginStart = 2
-MarginStop = 10
-MarkInstantRecord = 1
-MaxVideoFileSize = 2000
-MenuKeyCloses = 0
-MenuScrollPage = 1
-MenuScrollWrap = 0
-MinEventTimeout = 30
-MinUserInactivity = 300
-MultiSpeedMode = 0
-NameInstantRecord = TITLE EPISODE
-NextWakeupTime = 0
-OSDHeight = 486
-OSDLanguage = en_US
-OSDLeft = 54
-OSDMessageTime = 1
-OSDSkin = sttng
-OSDTheme = default
-OSDTop = 45
-OSDWidth = 624
-PauseLifetime = 1
-PausePriority = 10
-PrimaryDVB = 1
-RecordingDirs = 1
-ResumeID = 0
-SetSystemTime = 0
-ShowInfoOnChSwitch = 1
-ShowReplayMode = 0
-SplitEditedFiles = 0
-SubtitleBgTransparency = 0
-SubtitleFgTransparency = 0
-SubtitleLanguages =
-SubtitleOffset = 0
-SVDRPTimeout = 300
-TimeoutRequChInfo = 1
-TimeSource = 0
-TimeTransponder = 0
-UpdateChannels = 5
-UseDolbyDigital = 1
-UseSmallFont = 1
-UseSubtitle = 1
-UseVps = 0
-VideoDisplayFormat = 1
-VideoFormat = 0
-VpsMargin = 120
-ZapTimeout = 3
-streamdev-server.AllowSuspend = 1
-streamdev-server.HTTPBindIP = 0.0.0.0
-streamdev-server.HTTPServerPort = 3000
-streamdev-server.HTTPStreamType = 2
-streamdev-server.MaxClients = 5
-streamdev-server.ServerPort = 2004
-streamdev-server.StartHTTPServer = 1
-streamdev-server.StartServer = 1
-streamdev-server.VTPBindIP = 0.0.0.0
diff --git a/config/vdr/etc/svdrphosts.conf b/config/vdr/etc/svdrphosts.conf
deleted file mode 100644
index 1bd087439..000000000
--- a/config/vdr/etc/svdrphosts.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# svdrphosts This file describes a number of host addresses that
-# are allowed to connect to the SVDRP port of the Video
-# Disk Recorder (VDR) running on this system.
-# Syntax:
-#
-# IP-Address[/Netmask]
-#
-
-127.0.0.1 # always accept localhost
-192.168.0.0/16 # any host on private addresses
-10.0.0.0/8 # any host on private addresses
diff --git a/config/vdr/plugins.d/conflictcheckonly.conf b/config/vdr/plugins.d/conflictcheckonly.conf
deleted file mode 100644
index d5146946d..000000000
--- a/config/vdr/plugins.d/conflictcheckonly.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
deleted file mode 100644
index 3c731190f..000000000
--- a/config/vdr/plugins.d/epgsearch.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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
deleted file mode 100644
index 9208556fb..000000000
--- a/config/vdr/plugins.d/epgsearchonly.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
deleted file mode 100644
index e30285061..000000000
--- a/config/vdr/plugins.d/quickepgsearch.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
deleted file mode 100644
index 52c11cfc3..000000000
--- a/config/vdr/plugins.d/streamdev-server.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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/config/vdr/runvdr b/config/vdr/runvdr
deleted file mode 100644
index 5dcfd6c39..000000000
--- a/config/vdr/runvdr
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/bash
-
-# runvdr - VDR launcher
-#
-# runvdr [VDROPTION]...
-
-shopt -s extglob nocasematch nullglob
-
-VDR=/usr/sbin/vdr
-PLUGINDIR=/usr/lib/vdr
-PLUGINVER=VDR_PLUGIN_VERSION
-PLUGINSUF=${PLUGINVER:+.$PLUGINVER}
-
-log()
-{
- type -P logger &>/dev/null && \
- logger -s -p daemon.info -t ${0##*/} "$1" 2>&1 || echo "INFO: $1"
-}
-
-plugconf()
-{
- local plugin=$1 PLUGIN_OPTIONS= PLUGIN_ENABLED=
- if [[ -e /etc/sysconfig/vdr-plugins.d/$plugin.conf ]] ; then
- . /etc/sysconfig/vdr-plugins.d/$plugin.conf
- case $PLUGIN_ENABLED in no|false|0) return ;; esac
- fi
- if [[ $PLUGIN_OPTIONS ]] ; then
- VDR_OPTIONS+=( --plugin="$plugin $PLUGIN_OPTIONS" )
- else
- VDR_OPTIONS+=( --plugin=$plugin )
- fi
-}
-
-build_cmdline()
-{
- local plugin= p=
- # Add "priority" plugins.
- for plugin in $VDR_PLUGIN_ORDER ; do
- [[ -e $PLUGINDIR/libvdr-${plugin}.so$PLUGINSUF ]] && plugconf $plugin
- done
- # Add the rest available.
- for plugin in $PLUGINDIR/libvdr-*.so$PLUGINSUF ; do
- plugin=${plugin##*/libvdr-}
- plugin=${plugin%.so$PLUGINSUF}
- for p in $VDR_PLUGIN_ORDER ; do
- if [[ $plugin == $p ]] ; then
- # Already added.
- continue 2
- fi
- done
- plugconf $plugin
- done
-}
-
-reload_dvb()
-{
- local modules=$( /sbin/lsmod | \
- awk '/^dvb_core/ { gsub(","," ",$4) ; print $4 }' )
- if [[ $modules ]] ; then
- log "Reloading DVB modules"
- /sbin/modprobe -r $modules dvb_core
- for module in $modules ; do
- /sbin/modprobe $module
- done
- fi
-}
-
-rc=
-while true ; do
- VDR_OPTIONS=()
- [[ -f /etc/sysconfig/vdr ]] && . /etc/sysconfig/vdr
- [[ $DAEMON_COREFILE_LIMIT ]] && \
- ulimit -S -c $DAEMON_COREFILE_LIMIT &>/dev/null && \
- VDR_OPTIONS+=( --userdump ) && cd ${TMPDIR:-/tmp}
- build_cmdline
-
- $VDR "$@" "${VDR_OPTIONS[@]}"
- rc=$?
-
- # 137: "kill -KILL" eg in killproc(), others: "man vdr"
- case $rc in
- 0|2|137)
- log "VDR exited with status $rc, exiting"
- break
- ;;
- *)
- log "VDR exited with status $rc, attempting restart"
- case $RELOAD_DVB in yes|true|1) reload_dvb ;; esac
- ;;
- esac
-
-done
-
-exit $rc
diff --git a/config/vdr/vdr.sysconfig b/config/vdr/vdr.sysconfig
deleted file mode 100644
index 9c7906912..000000000
--- a/config/vdr/vdr.sysconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-# System configuration for VDR -*- sh -*-
-
-# The "master" options. Some examples of options you may want to set
-# here are -r, -t, and --rcu. See the vdr(1) man page for more info.
-#
-VDR_OPTIONS=(--vfat --log=1)
-
-# VDR_PLUGIN_ORDER is a space separated list of plugins that should be
-# loaded in a specific order. This affects eg. the order the plugins'
-# menu entries are displayed OSD menus by default. The plugins in this
-# list don't need to be installed, but if they are, they will be loaded
-# before other possibly installed plugins. Note that it is recommended
-# to load output plugins before others so that all necessary features are
-# present when needed by other plugins at startup/shutdown.
-#
-VDR_PLUGIN_ORDER="
-streamdev-server
-epgsearch
-vnsiserver3
-"
-
-# PATH where to find the internally used executables.
-#
-PATH="/usr/lib/vdr/bin:$PATH"
-
-# How many minutes before a recording should the VDR box wake up?
-# Some CI/CAM combinations can take quite a long time to initialize, so
-# we default to a pretty generous value here.
-#
-WAKEUP_BEFORE_RECORDING=10
-
-# Try reloading DVB modules on unexpected exits?
-#
-#RELOAD_DVB=yes
-
-# For debugging: allow vdr to dump core. Note that depending on the operating
-# environment, core dumps from setuid processes may be a security issue.
-#
-#DAEMON_COREFILE_LIMIT="unlimited"
diff --git a/config/vdradmin/install-ipfire.sh b/config/vdradmin/install-ipfire.sh
deleted file mode 100755
index 9a6655b7b..000000000
--- a/config/vdradmin/install-ipfire.sh
+++ /dev/null
@@ -1,290 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2005/6 Andreas Mair
-#
-#
-# Download and patchscript for VDRAdmin-AM
-# (based on install.sh Copyright (c) 2003 Frank (xpix) Herrmann)
-
-PATH=$PATH:/sbin:/bin:/usr/sbin:/usr/bin
-DESTDIR=${DESTDIR}
-LIBDIR=${LIBDIR:-$DESTDIR/usr/share/vdradmin}
-ETCDIR=${ETCDIR:-$DESTDIR/etc/vdradmin}
-DOCDIR=${DOCDIR:-$DESTDIR/usr/share/doc/vdradmin}
-BINDIR=${BINDIR:-$DESTDIR/usr/bin}
-LOCDIR=${LOCDIR:-$DESTDIR/usr/share/locale}
-MANDIR=${MANDIR:-$DESTDIR/usr/share/man/man1}
-LOGDIR=${LOGDIR:-$DESTDIR/var/log}
-CACHEDIR=${CACHEDIR:-$DESTDIR/var/cache/vdradmin}
-PIDFILE=${PIDFILE:-$DESTDIR/var/run/vdradmind.pid}
-VIDEODIR=${VIDEODIR:-/var/video}
-EPGIMAGES=${EPGIMAGES:-$VIDEODIR/epgimages}
-VDRCONF=${VDRCONF:-/etc/vdr}
-
-function usage()
-{
- echo ""
- echo "usage: $(basename $0) [-c | -u | -p | -h]"
- echo ""
- echo -e "\t-c : Run \"vdradmind -c\" after installation (=configure)."
- echo -e "\t-u : Perform uninstall."
- echo -e "\t-p : List and optionally install required Perl modules."
- echo -e "\t-h : This message."
- echo ""
- exit 0
-}
-
-function killRunningVDRAdmin()
-{
- local KILLED=0
- local PID=$(pidof vdradmind)
- [ "$PID" ] || PID=$(ps a | grep vdradmind.pl | grep perl | grep -v grep | cut -d' ' -f1)
- if [ "$PID" ]; then
- KILLED=1
- kill $PID
- fi
-
- return $KILLED
-}
-
-# $1 - the Perl module to check for.
-function checkPerlModule()
-{
- [ -z "$1" ] && return 1
-
- local MODULE=$1
- local ALT_MODULE=$2
- local ALT_MESSAGE=
- [ "$ALT_MODULE" ] && ALT_MESSAGE=" or $ALT_MODULE"
-
- echo -n "Checking for Perl module $MODULE$ALT_MESSAGE... "
- perl -ce 'BEGIN{$0 =~ /(^.*\/)/; $BASENAME = $1; unshift(@INC, $BASENAME . "lib/");} use '$MODULE >/dev/null 2>&1
- if [ $? -eq 2 ]; then
- if [ "$ALT_MODULE" ]; then
- perl -ce 'BEGIN{$0 =~ /(^.*\/)/; $BASENAME = $1; unshift(@INC, $BASENAME . "lib/");} use '$ALT_MODULE >/dev/null 2>&1
- [ $? -eq 0 ] && echo " $ALT_MODULE found" && return 0
- fi
- echo " MISSING"
- read -p "Do you want to install $MODULE? [y/N]"
- [ "$REPLY" = "y" -o "$REPLY" = "Y" ] && su -c "perl -MCPAN -e 'CPAN::install \"$MODULE\"'"
- else
- echo " found"
- fi
-
-}
-
-function perlModules()
-{
- echo ""
- echo "*** Required ***"
- checkPerlModule locale
- checkPerlModule Env
- checkPerlModule Template
- checkPerlModule Template::Plugin::JavaScript
- checkPerlModule CGI
- checkPerlModule HTTP::Date
- checkPerlModule IO::Socket
- checkPerlModule Time::Local
- checkPerlModule MIME::Base64
- checkPerlModule File::Temp
- checkPerlModule URI::Escape
-
-
- echo ""
- echo "You need Locale::gettext OR Locale::Messages"
- checkPerlModule Locale::gettext Locale::Messages
-
- echo ""
- echo "*** Optional ***"
- echo "* Required for AutoTimer email notification"
- #checkPerlModule Net::SMTP
- #checkPerlModule Authen::SASL
- echo "* Required for AutoTimer email notification and CRAM-MD5 authentication"
- checkPerlModule Digest::HMAC_MD5
- echo "* Required if VDR and VDRAdmin-AM use different character encoding"
- checkPerlModule Encode
- echo "* Required for IPv6 support"
- #checkPerlModule IO::Socket::INET6
- echo "* Required for SSL support (https)"
- #checkPerlModule IO::Socket::SSL
- echo "* Required if you want to use gzip'ed HTTP responses"
- checkPerlModule Compress::Zlib
- echo "* Required if you want to log to syslog"
- checkPerlModule Sys::Syslog
-}
-
-function makeDir()
-{
- [ -z "$1" ] && return 1
- local DIR=$1
- local MUST_CREATE=${2:-0}
- if [ -e "$DIR" -a ! -d "$DIR" ]; then
- echo "$DIR exists but is no directory!"
- echo "Aborting..."
- return 1
- elif [ -d $DIR -a $MUST_CREATE = 1 ]; then
- echo "$DIR exists. Please remove it before calling install.sh!"
- echo "Aborting..."
- return 1
- fi
- if [ ! -e "$DIR" ]; then
- mkdir -p "$DIR"
- if [ $? -ne 0 ]; then
- echo "Failed to create directory $DIR!"
- echo "Aborting..."
- return 1
- fi
- fi
-
- return 0
-}
-
-function doInstall()
-{
- echo ""
- echo "********* Installing VDRAdmin-AM *************"
- echo ""
-
- perlModules
-
- makeDir $LIBDIR 1 && cp -r template lib $LIBDIR || exit 1
- makeDir $DOCDIR && cp -r contrib COPYING CREDITS HISTORY INSTALL LGPL.txt README* REQUIREMENTS FAQ $DOCDIR || exit 1
- makeDir $MANDIR && cp vdradmind.pl.1 $MANDIR/vdradmind.1 || exit 1
- makeDir $ETCDIR || exit 1
-
- (
- cd locale
- for lang in *
- do
- makeDir $LOCDIR/$lang/LC_MESSAGES/ && install -m 644 $lang/LC_MESSAGES/vdradmin.mo $LOCDIR/$lang/LC_MESSAGES/vdradmin.mo || exit 1
- done
- )
-
- local RESTART=
- [ ! -e $BINDIR ] && mkdir -p $BINDIR
- if [ -d $BINDIR ]; then
- killRunningVDRAdmin
- if [ $? -ne 0 ] ; then
- RESTART=1
- echo "Killed running VDRAdmin-AM..."
- fi
- sed <vdradmind.pl >$BINDIR/vdradmind \
- -e "s/^\(my \$SEARCH_FILES_IN_SYSTEM *=\) 0;/\1 1;/" \
- -e "s:/usr/share/vdradmin/lib:${LIBDIR}/lib:" \
- -e "s:/usr/share/vdradmin/template:${LIBDIR}/template:" \
- -e "s:/var/log:${LOGDIR}:" \
- -e "s:/var/cache/vdradmin:${CACHEDIR}:" \
- -e "s:/var/run/vdradmind.pid:${PIDFILE}:" \
- -e "s:\(\$ETCDIR *= \)\"/etc/vdradmin\";:\1\"${ETCDIR}\";:" \
- -e "s:/usr/share/locale:${LOCDIR}:" \
- -e "s:\(\$CONFIG{VIDEODIR} *= \)\"/video\";:\1\"${VIDEODIR}\";:" \
- -e "s:\(\$CONFIG{EPGIMAGES} *= \)\"\$CONFIG{VIDEODIR}/epgimages\";:\1\"${EPGIMAGES}\";:" \
- -e "s:\(\$CONFIG{VDRCONFDIR} *= \)\"\$CONFIG{VIDEODIR}\";:\1\"${VDRCONF}\";:"
-
- chmod a+x $BINDIR/vdradmind
-
- if [ "$CONFIG" ]; then
- echo "Configuring VDRAdmin-AM..."
- $BINDIR/vdradmind -c
- fi
-
- if [ "$RESTART" ]; then
- echo "Restarting VDRAdmin-AM..."
- $BINDIR/vdradmind
- fi
-
- echo ""
- if [ -e $BINDIR/vdradmind.pl ]; then
- echo "Removing ancient $BINDIR/vdradmind.pl"
- rm -f $BINDIR/vdradmind.pl
- fi
- if [ -e $MANDIR/vdradmind.pl.1 ]; then
- echo "Removing ancient $MANDIR/vdradmind.pl.1"
- rm -f $MANDIR/vdradmind.pl.1
- fi
- else
- echo "$BINDIR exists but is no directory!"
- echo "Aborting..."
- exit 1
- fi
-
- echo ""
- echo ""
- echo "VDRAdmin-AM has been installed!"
- echo ""
- if [ -z "$RESTART" ]; then
- echo "Run \"$BINDIR/vdradmind\" to start VDRAdmin-AM."
- echo ""
- fi
- echo "NOTE:"
- echo "If you want to run VDRAdmin-AM in a different language you must set the LANG environment variable (see README)."
- echo ""
- echo "NOTE2:"
- echo "If you would like VDRAdmin-AM to start at system's boot, please modify your system's init scripts."
- exit 0
-}
-
-function doUninstall()
-{
- echo ""
- echo "********* Uninstalling VDRAdmin-AM *************"
- echo ""
-
- killRunningVDRAdmin
- if [ -d $DOCDIR ]; then
- rm -rf $DOCDIR
- fi
- if [ -d $LIBDIR ]; then
- rm -rf $LIBDIR
- fi
- if [ -d $CACHEDIR ]; then
- rm -rf $CACHEDIR
- fi
- if [ -e $MANDIR/vdradmind.pl.1 ]; then
- rm -f $MANDIR/vdradmind.pl.1
- fi
- if [ -e $MANDIR/vdradmind.1 ]; then
- rm -f $MANDIR/vdradmind.1
- fi
- if [ -e $BINDIR/vdradmind.pl ]; then
- rm -f $BINDIR/vdradmind.pl
- fi
- if [ -e $BINDIR/vdradmind ]; then
- rm -f $BINDIR/vdradmind
- fi
- rm -f $LOCDIR/*/LC_MESSAGES/vdradmin.mo
-
- echo ""
- echo "VDRAdmin-AM has been uninstalled!"
- echo ""
- if [ -d $ETCDIR ]; then
- echo "Your configuration files located in $ETCDIR have NOT been deleted!"
- echo "If you want to get rid of them, please delete them manually!"
- echo ""
- fi
-}
-
-UNINSTALL=
-CONFIG=
-PERL=
-while [ "$1" ]
-do
- case $1 in
- -u) UNINSTALL=1;;
- -c) CONFIG=1;;
- -p) PERL=1;;
- -h) usage;;
- *) echo "Ignoring param \"$1\$.";;
- esac
- shift
-done
-
-if [ $(basename $0) = "uninstall.sh" -o "$UNINSTALL" ]; then
- doUninstall
-elif [ "$PERL" ]; then
- echo ""
- echo "Testing required Perl modules..."
- perlModules
- echo "...done."
-else
- doInstall
-fi
diff --git a/config/vdradmin/vdradmind.conf b/config/vdradmin/vdradmind.conf
deleted file mode 100644
index a3b2d485a..000000000
--- a/config/vdradmin/vdradmind.conf
+++ /dev/null
@@ -1,88 +0,0 @@
-AT_DESC = 0
-AT_FUNC = 1
-AT_LIFETIME = 99
-AT_MARGIN_BEGIN = 10
-AT_MARGIN_END = 10
-AT_OFFER = 0
-AT_PRIORITY = 99
-AT_SENDMAIL = 0
-AT_SORTBY = pattern
-AT_TOOLTIP = 1
-AUTO_SAVE_CONFIG = 1
-CACHE_BG_UPDATE = 1
-CACHE_LASTUPDATE = 0
-CACHE_REC_ENABLED = 1
-CACHE_REC_LASTUPDATE = 0
-CACHE_REC_TIMEOUT = 60
-CACHE_TIMEOUT = 60
-CHANNELS_WANTED =
-CHANNELS_WANTED_AUTOTIMER = 0
-CHANNELS_WANTED_PRG = 0
-CHANNELS_WANTED_PRG2 = 0
-CHANNELS_WANTED_SUMMARY = 0
-CHANNELS_WANTED_TIMELINE = 0
-CHANNELS_WANTED_WATCHTV = 0
-CHANNELS_WITHOUT_EPG = 0
-CMD_LINES = 20
-EPGIMAGES = /var/video/epgimages
-EPG_PRUNE = 0
-ES_DESC = 0
-ES_SORTBY = pattern
-GUEST_ACCOUNT = 0
-GUI_POPUP_HEIGHT = 250
-GUI_POPUP_WIDTH = 500
-LANG = en_US.utf8
-LOCAL_NET = 0.0.0.0/32
-LOGFILE = vdradmind.log
-LOGGING = 0
-LOGINPAGE = 0
-LOGLEVEL = 81
-MAIL_AUTH_PASS =
-MAIL_AUTH_USER =
-MAIL_FROM = from(a)address.tld
-MAIL_SERVER = your.email.server
-MAIL_TO = your(a)email.address
-MOD_GZIP = 0
-NO_EVENTID = 0
-NO_EVENTID_ON =
-PASSWORD = ipfire
-PASSWORD_GUEST = guest
-PROG_SUMMARY_COLS = 3
-PS_VIEW = ext
-RECORDINGS = 1
-REC_DESC = 0
-REC_EXT = m3u
-REC_MIMETYPE = video/x-mpegurl
-REC_SORTBY = name
-SERVERHOST = 0.0.0.0
-SERVERPORT = 8001
-SKIN = default
-ST_FUNC = 1
-ST_LIVE_ON = 1
-ST_REC_ON = 0
-ST_STREAMDEV_HOST =
-ST_STREAMDEV_PORT = 3000
-ST_URL =
-ST_VIDEODIR =
-TEMPLATE = default
-TIMES = 18:00, 20:00, 21:00, 22:00
-TL_TOOLTIP = 1
-TM_DESC = 0
-TM_LIFETIME = 99
-TM_MARGIN_BEGIN = 10
-TM_MARGIN_END = 10
-TM_PRIORITY = 99
-TM_SORTBY = day
-TM_TT_LIST = 1
-TM_TT_TIMELINE = 1
-TV_EXT = m3u
-TV_INTERVAL = 5
-TV_MIMETYPE = video/x-mpegurl
-TV_SIZE = half
-USERNAME = vdradmin
-USERNAME_GUEST = guest
-VDRCONFDIR = /etc/vdr
-VDR_HOST = localhost
-VDR_PORT = 6419
-VIDEODIR = /var/video
-ZEITRAHMEN = 1
diff --git a/lfs/initscripts b/lfs/initscripts
index 3a769bd99..77c0fce2a 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -139,9 +139,6 @@ $(TARGET) :
ln -sf ../init.d/sslh /etc/rc.d/rc3.d/S98sslh
ln -sf ../init.d/sslh /etc/rc.d/rc0.d/K02sslh
ln -sf ../init.d/sslh /etc/rc.d/rc6.d/K02sslh
- ln -sf ../init.d/vdradmin /etc/rc.d/rc3.d/S99vdradmin
- ln -sf ../init.d/vdradmin /etc/rc.d/rc0.d/K01vdradmin
- ln -sf ../init.d/vdradmin /etc/rc.d/rc6.d/K01vdradmin
ln -sf ../init.d/motion /etc/rc.d/rc3.d/S99motion
ln -sf ../init.d/motion /etc/rc.d/rc0.d/K01motion
ln -sf ../init.d/motion /etc/rc.d/rc6.d/K01motion
diff --git a/lfs/strip b/lfs/strip
index 08aaee7c4..887f7e7aa 100644
--- a/lfs/strip
+++ b/lfs/strip
@@ -56,9 +56,5 @@ md5 :
###############################################################################
$(TARGET) :
- # Don't strip VDR binaries, because they use a weird plugin system
- # which does not work when unneeded symbols get stripped from
- # /usr/sbin/vdr.
STRIP=$(STRIP) $(SHELL) $(DIR_SRC)/src/stripper $(ROOT) \
- --exclude=/usr/src --exclude=$(TOOLS_DIR) \
- --exclude=/usr/sbin/vdr --exclude=/usr/lib/vdr
+ --exclude=/usr/src --exclude=$(TOOLS_DIR)
diff --git a/lfs/vdr b/lfs/vdr
deleted file mode 100644
index f82df19fe..000000000
--- a/lfs/vdr
+++ /dev/null
@@ -1,147 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 2.0.5
-
-# VDRPLUGVER must match with APIVERSION in config.h
-# after change this update also all vdr plugins
-VDRPLUGVER = 2.0.0
-
-THISAPP = vdr-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
-
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = vdr
-PAK_VER = 9
-
-SUP_ARCH = none
-
-DEPS = "vdr_streamdev"
-
-MAKE_OPTIONS = \
- PREFIX=/usr \
- BINDIR=/usr/bin \
- CACHEDIR=/var/cache/vdr \
- CONFDIR=/etc/vdr \
- INCDIR=/usr/include \
- LIBDIR=/usr/lib/vdr \
- LOCDIR=/usr/share/locale \
- MANDIR=/usr/share/man \
- RESDIR=/usr/share/vdr \
- RUNDIR=/var/run \
- VARDIR=/var \
- VIDEODIR=/var/video \
- CFLAGS="$(CFLAGS)" \
- CXXFLAGS="$(CXXFLAGS)"
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = f58b9836a60440fde84480a2e37ee91d
-
-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 jxf $(DIR_DL)/$(DL_FILE)
-
- # Compile main package.
- cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir
-
- # Compile bundled plugins.
- #cd $(DIR_APP) && for plugin in ...; do \
- # make $(MAKETUNING) -C PLUGINS/src/$$plugin VDRDIR=$(DIR_APP) \
- # CFLAGS="$(CFLAGS) -I$(DIR_APP)/include" \
- # CXXFLAGS="$(CXXFLAGS) -I$(DIR_APP)/include" \
- # PLGCFG=$(DIR_APP)/plugins.mk all || exit 1; \
- #done
-
- # Install main package.
- cd $(DIR_APP) && make install-bin install-dirs install-includes $(MAKE_OPTIONS)
- mv -v /usr/bin/vdr /usr/sbin/vdr
-
- sed -e "s/VDR_PLUGIN_VERSION/$(VDRPLUGVER)/" \
- < $(DIR_SRC)/config/vdr/runvdr > /usr/sbin/runvdr
- chmod 755 /usr/sbin/runvdr
-
- # Install configuration.
- mkdir -pv /etc/vdr
- mkdir -pv /etc/sysconfig/vdr-plugins.d
- cd $(DIR_APP) && install -m 644 $(DIR_SRC)/config/vdr/vdr.sysconfig \
- /etc/sysconfig/vdr
- cd $(DIR_APP) && install -m 644 *.conf /etc/vdr
-
- # Link development files.
- mkdir -pv /usr/lib/vdr
- cd $(DIR_APP) && cp -vf Make.global /usr/lib/vdr
- ln -svf ../../include/vdr/config.h /usr/lib/vdr/config.h
- ln -svf ../../include/vdr/device.h /usr/lib/vdr/device.h
-
- #install initscripts
- $(call INSTALL_INITSCRIPT,vdr)
-
- # Install start links and backup include file.
- ln -sf ../init.d/vdr /etc/rc.d/rc3.d/S60vdr
- ln -sf ../init.d/vdr /etc/rc.d/rc0.d/K40vdr
- ln -sf ../init.d/vdr /etc/rc.d/rc6.d/K40vdr
- install -v -m 644 $(DIR_SRC)/config/backup/includes/vdr \
- /var/ipfire/backup/addons/includes/vdr
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi
deleted file mode 100644
index d11a4b4dd..000000000
--- a/lfs/vdr_dvbapi
+++ /dev/null
@@ -1,123 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 1.0.6
-SUP_ARCHES =
-
-THISAPP = vdr-plugin-dvbapi-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = vdr_dvbapi
-PAK_VER = 1
-
-DEPS = ""
-
-VDRPLUGVER = 2.0.0
-
-EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-CFLAGS += $(EXTRA_FLAGS)
-CXXFLAGS += $(EXTRA_FLAGS)
-
-CSAFLAGS = -O3 -fexpensive-optimizations -funroll-loops
-CSAFLAGS-sse = $(CSAFLAGS) -mmmx -msse -msse2 -msse3
-PARALLEL = PARALLEL_64_LONG
-PARALLEL-sse = PARALLEL_128_SSE2
-
-define BUILD
- cp -a $(DIR_APP) $(DIR_APP)-build$(1)
- cd $(DIR_APP)-build$(1) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \
- CFLAGS="$(CFLAGS$(1))" CXXFLAGS="$(CXXFLAGS$(1))" \
- CSAFLAGS="$(CSAFLAGS$(1))" PARALLEL="$(PARALLEL$(1))" \
- LOCALEDIR=$$(pwd)/locale all
-
- -mkdir -pv /etc/vdr/plugins/dvbapi
- cd $(DIR_APP)-build$(1) && install -m 755 libvdr-dvbapi.so \
- /usr/lib/vdr/libvdr-dvbapi.so.$(VDRPLUGVER)$(1)
-endef
-
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 6a8024b2970beba8eadc1acaa86805e7
-
-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)
-
-ifeq "$(BUILD_ARCH)" "i586"
- # Build an SSE enabled version.
- $(call BUILD,-sse)
-endif
-
- # Build normal version.
- $(call BUILD)
-
- echo "#" > /etc/sysconfig/vdr-plugins.d/dvbapi.conf
- echo "# Command line parameters for vdr-plugin-dvbapi" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
- echo "#" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
- echo "# For more details see:" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
- echo "# - \`vdr --help -Pdvbapi\`" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
- echo "PLUGIN_OPTIONS=\"\"" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
-
- @rm -rf $(DIR_APP)*
- @$(POSTBUILD)
diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg
deleted file mode 100644
index 4a3f811d8..000000000
--- a/lfs/vdr_eepg
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-GIT_VER = 69b47ba4bf0195fd6820beb2cf4f7c7ea31f4011
-VER = master
-SUP_ARCHES =
-
-THISAPP = vdr-plugin-eepg-$(VER)
-DL_FILE = vdr-plugin-eepg-$(GIT_VER).tar.bz2
-
-# SOURCE http://projects.vdr-developer.org/git/vdr-plugin-eepg.git/snapshot
-
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = vdr_eepg
-PAK_VER = 1
-
-DEPS = ""
-
-VDRPLUGVER = 2.0.0
-
-EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-CFLAGS += $(EXTRA_FLAGS)
-CXXFLAGS += $(EXTRA_FLAGS)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 0d8049949263f9a2b8deb2ae9919bc49
-
-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_SRC) && mv vdr-plugin-eepg-$(GIT_VER) $(THISAPP)
-
- cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \
- CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
- LOCALEDIR=$$(pwd)/locale all
-
- mkdir -pv /etc/vdr/plugins/eepg
- cd $(DIR_APP) && install -m 755 libvdr-eepg.so \
- /usr/lib/vdr/libvdr-eepg.so.$(VDRPLUGVER)
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch
deleted file mode 100644
index 1a202b34b..000000000
--- a/lfs/vdr_epgsearch
+++ /dev/null
@@ -1,116 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 1.0.1.beta5
-SUP_ARCHES =
-
-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 = 7
-
-DEPS = ""
-
-VDRPLUGVER = 2.0.0
-
-EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-CFLAGS += $(EXTRA_FLAGS)
-CXXFLAGS += $(EXTRA_FLAGS)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 6e63cc29df02f48fabf6e12e1e71b2fc
-
-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 \
- CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
- LOCALEDIR=$$(pwd)/locale all
-
- cd $(DIR_APP) && install -m 755 libvdr-conflictcheckonly.so \
- /usr/lib/vdr/libvdr-conflictcheckonly.so.$(VDRPLUGVER)
- cd $(DIR_APP) && install -m 755 libvdr-epgsearchonly.so \
- /usr/lib/vdr/libvdr-epgsearchonly.so.$(VDRPLUGVER)
- cd $(DIR_APP) && install -m 755 libvdr-epgsearch.so \
- /usr/lib/vdr/libvdr-epgsearch.so.$(VDRPLUGVER)
- cd $(DIR_APP) && install -m 755 libvdr-quickepgsearch.so \
- /usr/lib/vdr/libvdr-quickepgsearch.so.$(VDRPLUGVER)
-
- 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_streamdev b/lfs/vdr_streamdev
deleted file mode 100644
index c6d21f110..000000000
--- a/lfs/vdr_streamdev
+++ /dev/null
@@ -1,108 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 0.6.1
-GIT_VER = 10db11ac
-SUP_ARCHES =
-
-THISAPP = vdr-streamdev-$(GIT_VER)
-DL_FILE = $(THISAPP).tar.xz
-
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = vdr_streamdev
-PAK_VER = 2
-
-DEPS = ""
-
-VDRPLUGVER = 2.0.0
-
-EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-CFLAGS += $(EXTRA_FLAGS)
-CXXFLAGS += $(EXTRA_FLAGS)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = e5011fd1a4b0624b192911f37c6040e3
-
-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 -Np1 < $(DIR_SRC)/src/patches/vdr-streamdev_recordings-64.patch
-
- 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 \
- CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
- 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.$(VDRPLUGVER)
- ln -svf ../../svdrphosts.conf \
- /etc/vdr/plugins/streamdev-server/streamdevhosts.conf
- 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/vdradmin b/lfs/vdradmin
deleted file mode 100644
index a78919f7e..000000000
--- a/lfs/vdradmin
+++ /dev/null
@@ -1,94 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 3.6.9
-
-THISAPP = vdradmin-am-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = vdradmin
-PAK_VER = 5
-
-DEPS = "perl-gettext vdr vdr_epgsearch"
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = d5cd89325f5a5dca5846a905b17d0bc2
-
-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 jxf $(DIR_DL)/$(DL_FILE)
- export "LANG=de_DE"
- cp $(DIR_SRC)/config/vdradmin/install-ipfire.sh $(DIR_APP)/
- cd $(DIR_APP) && ./install-ipfire.sh
-
- #install initscripts
- $(call INSTALL_INITSCRIPT,vdradmin)
-
- install -v -m 644 $(DIR_SRC)/config/vdradmin/vdradmind.conf \
- /etc/vdradmin/vdradmind.conf
- mkdir -pv /var/log/vdradmin
- mkdir -pv /var/run/vdradmin
- mkdir -pv /var/cache/vdradmin
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 64210a68b..7572c54dd 100755
--- a/make.sh
+++ b/make.sh
@@ -1455,11 +1455,6 @@ buildipfire() {
lfsmake2 faad2
lfsmake2 alac
lfsmake2 ffmpeg
- lfsmake2 vdr
- lfsmake2 vdr_streamdev
- lfsmake2 vdr_epgsearch
- lfsmake2 vdr_dvbapi
- lfsmake2 vdr_eepg
lfsmake2 w_scan
lfsmake2 mpd
lfsmake2 libmpdclient
@@ -1493,7 +1488,6 @@ buildipfire() {
lfsmake2 sslh
lfsmake2 perl-gettext
lfsmake2 perl-Sort-Naturally
- lfsmake2 vdradmin
lfsmake2 perl-DBI
lfsmake2 perl-DBD-SQLite
lfsmake2 perl-File-ReadBackwards
diff --git a/src/initscripts/packages/vdr b/src/initscripts/packages/vdr
deleted file mode 100644
index 759ad344d..000000000
--- a/src/initscripts/packages/vdr
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/vdr
-#
-# Description : This is a script that starts vdr as deamon
-#
-# Authors : Arne Fitzenreiter (arne(a)ipfire.org)
-#
-# Version : 01.00
-#
-# Notes :
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-case "${1}" in
- start)
- boot_mesg "Starting Video Disk Recorder..."
- /usr/sbin/runvdr >/dev/null 2>&1 &
- evaluate_retval
- ;;
-
- stop)
- boot_mesg "Stopping Video Disk Recorder..."
- killproc /usr/sbin/vdr
- ;;
-
- restart)
- ${0} stop
- sleep 1
- ${0} start
- ;;
-
- status)
- statusproc /usr/sbin/runvdr
- statusproc /usr/sbin/vdr
- ;;
-
- *)
- echo "Usage: ${0} {start|stop|restart|status}"
- exit 1
- ;;
-esac
-
-# End $rc_base/init.d/vdr
diff --git a/src/initscripts/packages/vdradmin b/src/initscripts/packages/vdradmin
deleted file mode 100644
index a0858de35..000000000
--- a/src/initscripts/packages/vdradmin
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/vdradmin
-#
-# Description : This is a script that starts vdradmind as deamon
-#
-# Authors : Arne Fitzenreiter (arne(a)ipfire.org)
-#
-# Version : 01.00
-#
-# Notes : Changes in 01.01
-# : v.2.6.7 needs /var/run/vdradmin dir (earl(a)ipfire.org)
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-case "${1}" in
- start)
- boot_mesg "Starting VDR Webadministration Tool..."
- mkdir /var/run/vdradmin -p
- loadproc /usr/bin/vdradmind > /dev/null
- evaluate_retval
- ;;
-
- stop)
- boot_mesg "Stopping VDR Webadministration Tool..."
- killproc /usr/bin/vdradmind
- ;;
-
- restart)
- ${0} stop
- sleep 1
- ${0} start
- ;;
-
- status)
- statusproc /usr/bin/vdradmind
- ;;
-
- *)
- echo "Usage: ${0} {start|stop|restart|status}"
- exit 1
- ;;
-esac
-
-# End $rc_base/init.d/vdradmin
diff --git a/src/paks/vdr/install.sh b/src/paks/vdr/install.sh
deleted file mode 100644
index 3e92d3275..000000000
--- a/src/paks/vdr/install.sh
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire 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 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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 IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_files
-restore_backup ${NAME}
-
-# Automatically add the GREEN network to svdrphosts.conf
-(
- eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
-
- GREEN_PREFIX=
- case "${GREEN_NETMASK}" in
- 255.255.255.252)
- GREEN_PREFIX=30
- ;;
- 255.255.255.248)
- GREEN_PREFIX=29
- ;;
- 255.255.255.240)
- GREEN_PREFIX=28
- ;;
- 255.255.255.224)
- GREEN_PREFIX=27
- ;;
- 255.255.255.192)
- GREEN_PREFIX=26
- ;;
- 255.255.255.128)
- GREEN_PREFIX=25
- ;;
- 255.255.255.0)
- GREEN_PREFIX=24
- ;;
- 255.255.254.0)
- GREEN_PREFIX=23
- ;;
- 255.255.252.0)
- GREEN_PREFIX=22
- ;;
- 255.255.248.0)
- GREEN_PREFIX=21
- ;;
- 255.255.240.0)
- GREEN_PREFIX=20
- ;;
- 255.255.224.0)
- GREEN_PREFIX=19
- ;;
- 255.255.192.0)
- GREEN_PREIFX=18
- ;;
- 255.255.128.0)
- GREEN_PREFIX=17
- ;;
- 255.255.0.0)
- GREEN_PREFIX=16
- ;;
- 255.254.0.0)
- GREEN_PREFIX=15
- ;;
- 255.252.0.0)
- GREEN_PREFIX=14
- ;;
- 255.248.0.0)
- GREEN_PREFIX=13
- ;;
- 255.240.0.0)
- GREEN_PREFIX=12
- ;;
- 255.224.0.0)
- GREEN_PREFIX=11
- ;;
- 255.192.0.0)
- GREEN_PREFIX=10
- ;;
- 255.128.0.0)
- GREEN_PREFIX=9
- ;;
- 255.0.0.0)
- GREEN_PREFIX=8
- ;;
- esac
-
- if [ -n "${GREEN_NETADDRESS}" ] && [ -n "${GREEN_PREFIX}" ]; then
- echo "${GREEN_NETADDRESS}/${GREEN_PREFIX}" >> /etc/vdr/svdrphosts.conf
- fi
-) || :
-
-start_service --background ${NAME}
-
-# Create video directory if it does not exist, yet.
-if [ ! -e "/var/video" ]; then
- mkdir -p /var/video
-fi
diff --git a/src/paks/vdr/uninstall.sh b/src/paks/vdr/uninstall.sh
deleted file mode 100644
index a7b8a5370..000000000
--- a/src/paks/vdr/uninstall.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire 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 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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 IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-stop_service ${NAME}
-make_backup ${NAME}
-remove_files
diff --git a/src/paks/vdr/update.sh b/src/paks/vdr/update.sh
deleted file mode 100644
index 62338975e..000000000
--- a/src/paks/vdr/update.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire 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 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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 IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-./uninstall.sh
-./install.sh
-
-OLD_DIR="/opt/vdr/etc"
-NEW_DIR="/etc/vdr"
-
-for conf in ${OLD_DIR}/*.conf; do
- [ -f "${conf}" ] || continue
-
- conf="$(basename ${conf})"
- mv -b "${OLD_DIR}/${conf}" "${NEW_DIR}/${conf}"
-done
diff --git a/src/paks/vdradmin/install.sh b/src/paks/vdradmin/install.sh
deleted file mode 100644
index 31c5fecae..000000000
--- a/src/paks/vdradmin/install.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire 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 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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 IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_files
-restore_backup ${NAME}
-start_service --background ${NAME}
diff --git a/src/paks/vdradmin/uninstall.sh b/src/paks/vdradmin/uninstall.sh
deleted file mode 100644
index a7b8a5370..000000000
--- a/src/paks/vdradmin/uninstall.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire 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 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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 IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-stop_service ${NAME}
-make_backup ${NAME}
-remove_files
diff --git a/src/paks/vdradmin/update.sh b/src/paks/vdradmin/update.sh
deleted file mode 100644
index 72d318544..000000000
--- a/src/paks/vdradmin/update.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire 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 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire 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 IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-
-./uninstall.sh
-./install.sh
-
-# Update configuration options for new versions of VDR.
-stop_service ${NAME}
-
-sed -i /etc/vdradmin/vdradmind.conf \
- -e "s@^LANG = .*@LANG = en_US.utf8(a)g" \
- -e "s@^VDR_PORT = .*@VDR_PORT = 6419(a)g" \
- -e "s@^VDRCONFDIR = .*@VDRCONFDIR = /etc/vdr(a)g"
-
-start_service ${NAME}
diff --git a/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch b/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch
deleted file mode 100644
index d8319c0af..000000000
--- a/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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 @@
- #<Configuration>
-
- # Your timers.conf
--TIMERS="/video/timers.conf"
-+TIMERS="/etc/vdr/timers.conf"
-
- #</Configuration>
-
diff --git a/src/patches/vdr-streamdev_recordings-64.patch b/src/patches/vdr-streamdev_recordings-64.patch
deleted file mode 100644
index 2dc5250b4..000000000
--- a/src/patches/vdr-streamdev_recordings-64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur vdr-streamdev-10db11ac.org/server/connectionHTTP.c vdr-streamdev-10db11ac/server/connectionHTTP.c
---- vdr-streamdev-10db11ac.org/server/connectionHTTP.c 2013-02-18 12:43:02.000000000 +0100
-+++ vdr-streamdev-10db11ac/server/connectionHTTP.c 2013-04-29 15:16:40.049168127 +0200
-@@ -455,11 +455,11 @@
- return NULL;
-
- char *p = NULL;
-- unsigned long l = strtoul(FileBase, &p, 0);
-+ unsigned long long l = strtoull(FileBase, &p, 0);
- if (p != FileBase && l > 0L) {
- if (*p == ':') {
- // get recording by dev:inode
-- unsigned long inode = strtoul(p + 1, &p, 0);
-+ unsigned long long inode = strtoull(p + 1, &p, 0);
- if (*p == 0 && inode > 0) {
- struct stat st;
- cThreadLock RecordingsLock(&Recordings);
-diff -Naur vdr-streamdev-10db11ac.org/server/menuHTTP.c vdr-streamdev-10db11ac/server/menuHTTP.c
---- vdr-streamdev-10db11ac.org/server/menuHTTP.c 2013-02-18 12:43:02.000000000 +0100
-+++ vdr-streamdev-10db11ac/server/menuHTTP.c 2013-04-29 15:15:30.352502787 +0200
-@@ -28,7 +28,7 @@
- {
- struct stat st;
- if (stat(current->FileName(), &st) == 0)
-- return cString::sprintf("%lu:%lu.rec", st.st_dev, st.st_ino);
-+ return cString::sprintf("%llu:%llu.rec", (unsigned long long) st.st_dev, (unsigned long long) st.st_ino);
- return "";
- }
-
--
2.20.1
^ permalink raw reply [flat|nested] 16+ messages in thread