diff --git a/packages/3rdparty/lib/xine-lib/build b/packages/3rdparty/lib/xine-lib/build
deleted file mode 100755
index cde604a63a..0000000000
--- a/packages/3rdparty/lib/xine-lib/build
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-# 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, 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 OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-VDR_GUI_ADDON_DIR="/storage/.xbmc/addons/script.video.vdr-gui"
-
-cd $PKG_BUILD
-
-strip_lto
-
-./autogen.sh --host=$TARGET_NAME \
- --build=$HOST_NAME \
- --with-external-ffmpeg \
- --disable-dxr3 \
- --disable-aalib \
- --disable-vcd \
- --disable-musepack
-
-sed -i "s|XINE_PLUGINDIR .*|XINE_PLUGINDIR \"$VDR_GUI_ADDON_DIR/lib/xine/plugins/2.1\"|" include/configure.h
-sed -i "s|XINE_PLUGINROOT .*|XINE_PLUGINROOT \"$VDR_GUI_ADDON_DIR/lib/xine/plugins/2\"|" include/configure.h
-
-# same for fonts and locales and copy them
-
-make
-$MAKEINSTALL
diff --git a/packages/3rdparty/lib/xine-lib/meta b/packages/3rdparty/lib/xine-lib/meta
deleted file mode 100644
index 1a6d579db2..0000000000
--- a/packages/3rdparty/lib/xine-lib/meta
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-# 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, 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 OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="xine-lib"
-PKG_VERSION="1-2-25f276f9211a"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.xine-project.org/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="ffmpeg"
-PKG_BUILD_DEPENDS="toolchain ffmpeg"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="xine is a high-performance, portable and reusable multimedia playback engine."
-PKG_LONGDESC="xine is a high-performance, portable and reusable multimedia playback engine."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta
index 06be1b532c..663200826c 100644
--- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta
+++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="vdr-plugin-dvbapi"
-PKG_VERSION="e87e15f"
+PKG_VERSION="cd93752"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-crosscompiling.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-crosscompiling.patch
new file mode 100644
index 0000000000..a249ffc18f
--- /dev/null
+++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-crosscompiling.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index d18b016..278af2b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -156,7 +156,7 @@ libdvbapi-dvbufs9xx.so: device-ufs9xx.o
+
+ ifndef LIBDVBCSA
+ $(FFDECSA): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h
+- @$(MAKE) COMPILER="$(CXX)" FLAGS="$(CXXFLAGS) $(LDFLAGS) $(CSAFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) all
++ @$(MAKE) COMPILER="$(CXX)" FLAGS="$(CXXFLAGS) $(LDFLAGS) $(CSAFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) FFdecsa.o
+ endif
+
+ install-lib: $(SOFILE)
diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-ffdecsa.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-ffdecsa.patch
new file mode 100644
index 0000000000..22f0684687
--- /dev/null
+++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-ffdecsa.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile b/Makefile
+index 278af2b..996dc77 100644
+--- a/Makefile
++++ b/Makefile
+@@ -85,8 +85,9 @@ OBJS = CAPMT.o DeCSA.o DeCsaTSBuffer.o dll.o DVBAPI.o DVBAPISetup.o SCDeviceProb
+
+ ifndef LIBDVBCSA
+ # FFdeCSA
+-PARALLEL ?= PARALLEL_128_SSE2
+-CSAFLAGS ?= -fexpensive-optimizations -funroll-loops -mmmx -msse -msse2 -msse3
++CPUOPT ?= pentium
++PARALLEL ?= PARALLEL_32_INT
++CSAFLAGS ?= -Wall -fPIC -g -O3 -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops
+ FFDECSADIR = FFdecsa
+ FFDECSA = $(FFDECSADIR)/FFdecsa.o
+ DECSALIB = $(FFDECSA)
diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-crosscompiling.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-crosscompiling.patch
deleted file mode 100644
index 7c9faef64e..0000000000
--- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-crosscompiling.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur vdr-dvbapi-plugin-6e8cad7/Makefile vdr-dvbapi-plugin-6e8cad7.patch/Makefile
---- vdr-dvbapi-plugin-6e8cad7/Makefile 2011-12-25 14:24:33.000000000 +0100
-+++ vdr-dvbapi-plugin-6e8cad7.patch/Makefile 2011-12-29 18:59:21.847652339 +0100
-@@ -80,7 +80,7 @@
- gcc -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o $@ $< -ldl
-
- $(FFDECSA): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h
-- @$(MAKE) COMPILER="$(CXX)" FLAGS="$(CSAFLAGS) -march=$(CPUOPT)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) all
-+ @$(MAKE) COMPILER="$(CXX)" FLAGS="$(CSAFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) FFdecsa.o
-
- dist: clean
- @-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-ffdecsa.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-ffdecsa.patch
deleted file mode 100644
index ed4e806134..0000000000
--- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-ffdecsa.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a8c7d97..6084cec 100644
---- a/Makefile
-+++ b/Makefile
-@@ -54,9 +54,9 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
- OBJS = CAPMT.o DeCSA.o DeCsaTSBuffer.o DVBAPI.o DVBAPISetup.o SCDeviceProbe.o SCDVBDevice.o UDPSocket.o SCCIAdapter.o Frame.o SCCAMSlot.o
-
- # FFdeCSA
--CPUOPT ?= athlon64
--PARALLEL ?= PARALLEL_128_SSE
--CSAFLAGS ?= -fPIC -O3 -fexpensive-optimizations -funroll-loops -mmmx -msse -msse2 -msse3
-+CPUOPT ?= pentium
-+PARALLEL ?= PARALLEL_32_INT
-+CSAFLAGS ?= -Wall -fPIC -g -O3 -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops
- FFDECSADIR = FFdecsa
- FFDECSA = $(FFDECSADIR)/FFdecsa.o
- FFDECSATEST = $(FFDECSADIR)/FFdecsa_test.done
diff --git a/packages/3rdparty/multimedia/vdr-skinanthra_1280_OS/meta b/packages/3rdparty/multimedia/vdr-skinanthra_1280_OS/meta
deleted file mode 100644
index 1846d44355..0000000000
--- a/packages/3rdparty/multimedia/vdr-skinanthra_1280_OS/meta
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-# 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, 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 OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="vdr-skinanthra_1280_OS"
-PKG_VERSION="1.0"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://anthra.justlinux.de/common/overview.html"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="vdr"
-PKG_BUILD_DEPENDS="toolchain vdr"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="anthra skin for text2skin plugin."
-PKG_LONGDESC="anthra skin for text2skin plugin."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
diff --git a/packages/3rdparty/multimedia/vdr-text2skin/build b/packages/3rdparty/multimedia/vdr-text2skin/build
deleted file mode 100755
index 146cb34032..0000000000
--- a/packages/3rdparty/multimedia/vdr-text2skin/build
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-# 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, 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 OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-VDR_DIR=`basename $BUILD/vdr-[0-9]*`
-
-# you can not use GraphTFT together with Text2Skin if you use Imlib2!
-#IMAGELIB=imagemagick
-IMAGELIB=imlib2
-
-cd $PKG_BUILD
-
-make VDRDIR="../$VDR_DIR" \
- LIBDIR="." \
- LOCALEDIR="./locale" \
- IMAGELIB=$IMAGELIB
diff --git a/packages/3rdparty/multimedia/vdr-text2skin/meta b/packages/3rdparty/multimedia/vdr-text2skin/meta
deleted file mode 100644
index 47ddeef106..0000000000
--- a/packages/3rdparty/multimedia/vdr-text2skin/meta
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-# 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, 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 OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="vdr-text2skin"
-PKG_VERSION="20120506"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://linuxtv.org/vdrwiki/index.php/Text2skin-plugin"
-PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS="vdr"
-PKG_BUILD_DEPENDS="toolchain vdr imlib2"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="text2skin is a plugin to make On Screen Display in VDR."
-PKG_LONGDESC="text2skin plugin is designed to load and interpret a set of files describing the layout of the On Screen Display and to make this "Skin" available to VDR via Setup -> OSD in the main menu."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
diff --git a/packages/3rdparty/multimedia/vdr-xineliboutput/build b/packages/3rdparty/multimedia/vdr-xineliboutput/build
deleted file mode 100755
index 9d837432c1..0000000000
--- a/packages/3rdparty/multimedia/vdr-xineliboutput/build
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-# 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, 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 OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-VDR_DIR=$(basename $BUILD/vdr-[0-9]*)
-
-export PKG_CONFIG_PATH="${PKG_CONFIG_SYSROOT_DIR}/usr/local/lib/pkgconfig:${PKG_CONFIG_SYSROOT_DIR}buildd/lib/pkgconfig"
-
-cd $PKG_BUILD
-
-./configure --enable-x11 \
- --enable-vdr \
- --enable-libxine \
- --disable-dbus-glib-1 \
- --cc=$CC \
- --cxx=$CXX \
- --add-cflags="$CFLAGS"
-
-# mpg2c is running on host
-make mpg2c \
- CC="$HOST_CC" \
- CFLAGS="$HOST_CFLAGS" \
- LDFLAGS="$HOST_LDFLAGS" \
- VDRDIR="../$VDR_DIR" \
- LIBDIR="." \
- LOCALEDIR="./locale"
-
-make VDRDIR="../$VDR_DIR" \
- LIBDIR="." \
- LDFLAGS="-lm" \
- LOCALEDIR="./locale"
diff --git a/packages/3rdparty/multimedia/vdr-xineliboutput/meta b/packages/3rdparty/multimedia/vdr-xineliboutput/meta
deleted file mode 100644
index fa1099630b..0000000000
--- a/packages/3rdparty/multimedia/vdr-xineliboutput/meta
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-# 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, 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 OpenELEC.tv; see the file COPYING. If not, write to
-# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-# http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="vdr-xineliboutput"
-PKG_VERSION="20120506"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://sourceforge.net/projects/xineliboutput/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="vdr xine-lib"
-PKG_BUILD_DEPENDS="toolchain vdr xine-lib"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="xine-lib based software output device for VDR."
-PKG_LONGDESC="xine-lib based software output device for VDR."
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon
index 0c4d26f258..d29f6b09f7 100755
--- a/packages/addons/service/multimedia/vdr-addon/addon
+++ b/packages/addons/service/multimedia/vdr-addon/addon
@@ -37,7 +37,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
cp -PR $BUILD/vdr-live-*/live/* $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/live
cp $PKG_DIR/config.plugins/remote.conf $ADDON_BUILD/$PKG_ADDON_ID/config
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgsearch
- cp $PKG_DIR/config.plugins/commands.conf $ADDON_BUILD/$PKG_ADDON_ID/config
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
cp $BUILD/rotorng-[0-9]*/examples/rotorng.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
@@ -62,8 +61,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $BUILD/vdr-control-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $BUILD/vdr-epgsearch*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $BUILD/vdr-plugin-xmltv2vdr*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
- cp -PR $BUILD/vdr-xineliboutput-[0-9]*/libvdr*.so.1.7.27 $ADDON_BUILD/$PKG_ADDON_ID/plugin
- cp -PR $BUILD/vdr-text2skin-[0-9]*/libvdr*.so.1.7.27 $ADDON_BUILD/$PKG_ADDON_ID/plugin
# ENABLED_PLUGINS="cardclient constcw sc-conax sc-cryptoworks sc-irdeto sc-nagra sc-seca sc-viaccess sc-videoguard2"
# for plugin in $ENABLED_PLUGINS; do
@@ -89,18 +86,5 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -P $BUILD/libxslt-[0-9]*/libxslt/.libs/libxslt*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
cp -P $BUILD/libxslt-[0-9]*/libexslt/.libs/libexslt*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/imlib2/loaders/
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/imlib2/filters/
- cp $SYSROOT_PREFIX/usr/lib/libImlib2.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib/
- cp $SYSROOT_PREFIX/usr/lib/imlib2/loaders/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib/imlib2/loaders/
- cp $SYSROOT_PREFIX/usr/lib/imlib2/filters/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib/imlib2/filters/
-
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
cp -PR $BUILD/vdr-plugin-streamdev-*/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/text2skin/anthra_1280_OS/
- cp -PR $BUILD/vdr-skinanthra_1280_OS-*/* $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/text2skin/anthra_1280_OS/
- rm -fr $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/text2skin/anthra_1280_OS/themes
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/themes
- cp -P $BUILD/vdr-skinanthra_1280_OS-*/themes/* $ADDON_BUILD/$PKG_ADDON_ID/config/themes/
diff --git a/packages/addons/service/multimedia/vdr-addon/config.plugins/commands.conf b/packages/addons/service/multimedia/vdr-addon/config.plugins/commands.conf
deleted file mode 100644
index 1ad67aeae5..0000000000
--- a/packages/addons/service/multimedia/vdr-addon/config.plugins/commands.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-Exit -> XBMC : killall -9 vdr-sxfe
-Reboot : reboot
-PowerOff : poweroff -f
diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
index 868e2dce1f..f88770f309 100644
--- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
@@ -18,7 +18,4 @@
-
-
-
diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta
index aeb334f985..368c9637ce 100644
--- a/packages/addons/service/multimedia/vdr-addon/meta
+++ b/packages/addons/service/multimedia/vdr-addon/meta
@@ -27,7 +27,7 @@ PKG_LICENSE="GPL"
PKG_SITE="http://www.openelec.tv"
PKG_URL=""
PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr vdr-xineliboutput vdr-text2skin vdr-skinanthra_1280_OS"
+PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr"
PKG_PRIORITY="optional"
PKG_SECTION="service.multimedia"
PKG_SHORTDESC="vdr: A powerful DVB TV application"
diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
index b91d677310..13ab9acfb2 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -83,12 +83,6 @@ fi
if [ "$ENABLE_XMLTV2VDR" == "true" ] ; then
VDR_ARG="$VDR_ARG -P xmltv2vdr"
fi
-if [ "$ENABLE_XINELIBOUTPUT" == "true" ] ; then
- VDR_ARG="$VDR_ARG -P 'xineliboutput --local=none --remote=$XINELIBOUTPUT_PORT' -s $ADDON_HOME/vdr-shutdown.sh"
-fi
-if [ "$ENABLE_TEXT2SKIN" == "true" ] ; then
- VDR_ARG="$VDR_ARG -P text2skin"
-fi
# dynamite must be LAST loaded plugin
if [ "$ENABLE_DYNAMITE" == "true" ] ; then
VDR_ARG="$VDR_ARG -P dynamite"
@@ -110,21 +104,9 @@ fi
if [ -f "$ADDON_CONFIG_DIR/setup.conf" ]; then
sed -i -e '/^$/d' $ADDON_CONFIG_DIR/setup.conf
- sed -i -e '/^OSDHeight.*$/d' $ADDON_CONFIG_DIR/setup.conf
- sed -i -e '/^OSDSkin.*$/d' $ADDON_CONFIG_DIR/setup.conf
- sed -i -e '/^OSDTheme.*$/d' $ADDON_CONFIG_DIR/setup.conf
- sed -i -e '/^xineliboutput.OSD.Blending.*$/d' $ADDON_CONFIG_DIR/setup.conf
- sed -i -e '/^xineliboutput.OSD.Size.*$/d' $ADDON_CONFIG_DIR/setup.conf
- sed -i -e '/^xineliboutput.OSD.SoftOSD.*$/d' $ADDON_CONFIG_DIR/setup.conf
sed -i -e '/^epgsearch.SVDRPPort.*$/d' $ADDON_CONFIG_DIR/setup.conf
fi
cat >>$ADDON_CONFIG_DIR/setup.conf << MYDATA
-OSDHeight = 1080
-OSDSkin = anthra_1280_OS
-OSDTheme = yabluelight
-xineliboutput.OSD.Blending = 1
-xineliboutput.OSD.Size = 1280x720
-xineliboutput.OSD.SoftOSD = 1
epgsearch.SVDRPPort = 2004
MYDATA
diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml
index ff5dbacfbe..afbdee613c 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml
@@ -25,9 +25,6 @@
Enable plugin: xmltv2vdr
Enable epgdata.com
epgdata.com PIN
- Enable plugin: xineliboutput
- xineliboutput: listen on port
- Enable plugin: text2skin
VDR Configuration
VDR Video Dir
PVR plugin
diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
index 0ff09ec8c6..1f82adda78 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
@@ -30,9 +30,6 @@
-
-
-