Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

packages/3rdparty/graphics/imlib2/build

@@ -0,0 +1,50 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+VDR_ADDON_DIR="/storage/.xbmc/addons/service.multimedia.vdr-addon"
+
+cd $PKG_BUILD
+
+case "$TARGET_ARCH" in
+  i386)
+    MMX_ARG="--enable-mmx --disable-amd64"
+    ;;
+  x86_64)
+    MMX_ARG="--enable-mmx --enable-amd64"
+    ;;
+  *)
+    MMX_ARG="--disable-mmx --disable-amd64"
+    ;;
+esac
+
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            $MMX_ARG
+
+sed -i "s|#define SYS_LOADERS_PATH .*|#define SYS_LOADERS_PATH \"$VDR_ADDON_DIR/lib/imlib2\"|" src/lib/loaderpath.h
+
+make
+$MAKEINSTALL

packages/3rdparty/graphics/imlib2/meta

@@ -0,0 +1,35 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="imlib2"
+PKG_VERSION="1.4.5"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://web.enlightenment.org/"
+PKG_URL="$SOURCEFORGE_SRC/enlightenment/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain libjpeg-turbo libpng tiff zlib bzip2"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="Imlib2 is a graphics library."
+PKG_LONGDESC="Imlib2 is a graphics library for file loading, saving, rendering, manipulation."
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"

packages/3rdparty/lib/ffmpeg/build

@@ -0,0 +1,65 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+
+./configure --prefix=/usr \
+            --cross-prefix=$TARGET_PREFIX \
+            --arch=$TARGET_ARCH \
+            --cpu=$TARGET_CPU \
+            --sysroot=$SYSROOT_PREFIX \
+            --sysinclude="$SYSROOT_PREFIX/usr/include" \
+            --nm="$NM" \
+            --ar="$AR" \
+            --as="$CC" \
+            --cc="$CC" \
+            --ld="$CC" \
+            --host-cc="$HOST_CC" \
+            --host-cflags="$HOST_CFLAGS" \
+            --host-ldflags="$HOST_LDFLAGS" \
+            --host-libs="" \
+            --extra-cflags="$CFLAGS" \
+            --extra-ldflags="$LDFLAGS" \
+            --build-suffix="" \
+            --target-os="linux" \
+            --enable-cross-compile \
+            --disable-static \
+            --enable-shared \
+            --disable-ffmpeg \
+            --disable-ffplay \
+            --disable-ffprobe \
+            --disable-ffserver \
+            --enable-gpl \
+            --enable-postproc \
+            --enable-swscale \
+            --enable-avfilter \
+            --enable-pthreads \
+            --disable-debug \
+            --enable-runtime-cpudetect \
+            --disable-crystalhd \
+            --enable-vdpau \
+            --disable-vaapi
+
+make
+$MAKEINSTALL

packages/3rdparty/lib/ffmpeg/meta

@@ -0,0 +1,35 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="ffmpeg"
+PKG_VERSION="0.10.2"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="LGPL"
+PKG_SITE="http://ffmpeg.org"
+PKG_URL="http://ffmpeg.org/releases/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
+PKG_LONGDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"

packages/3rdparty/lib/xine-lib/build

@@ -0,0 +1,43 @@
+#!/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
+
+./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

packages/3rdparty/lib/xine-lib/meta

@@ -0,0 +1,35 @@
+################################################################################
+#      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"

packages/3rdparty/multimedia/vdr-skinanthra_1280_OS/meta

@@ -0,0 +1,35 @@
+################################################################################
+#      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"

packages/3rdparty/multimedia/vdr-text2skin/build

@@ -0,0 +1,36 @@
+#!/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

packages/3rdparty/multimedia/vdr-text2skin/meta

@@ -0,0 +1,35 @@
+################################################################################
+#      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"

packages/3rdparty/multimedia/vdr-xineliboutput/build

@@ -0,0 +1,50 @@
+#!/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="." \
+     LOCALEDIR="./locale"

packages/3rdparty/multimedia/vdr-xineliboutput/meta

@@ -0,0 +1,35 @@
+################################################################################
+#      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"

packages/3rdparty/x11/app/xdotool/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.semicomplete.com/projects/xdotool/"
 PKG_URL="http://semicomplete.googlecode.com/files/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS="toolchain libXtst libXinerama"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/app"
 PKG_SHORTDESC="This tool lets you simulate keyboard input and mouse activity, move and resize windows, etc.."

packages/addons/service/downloadmanager/transmission/changelog.txt

@@ -1,3 +1,6 @@
+2.1.3
+- update to transmission-2.51
+
 2.1.2
 - update to addon version 2.1
 

packages/addons/service/downloadmanager/transmission/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="transmission"
-PKG_VERSION="2.50"
-PKG_REV="2"
+PKG_VERSION="2.51"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.transmissionbt.com/"

packages/addons/service/multimedia/vdr-addon/addon

@@ -37,6 +37,7 @@ 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
@@ -60,6 +61,8 @@ 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-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
@@ -82,6 +85,18 @@ 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/

packages/addons/service/multimedia/vdr-addon/changelog.txt

@@ -1,3 +1,9 @@
+2.1.6
+- added vdr-xmltv2vdr plugin
+- added xineliboutput plugin
+- added text2skin plugin
+- preparation for xine based VDR frontend as separate addon
+
 2.1.5
 - fixed rotorng
 - added wirbelscancontrol plugin

packages/addons/service/multimedia/vdr-addon/config.plugins/commands.conf

@@ -0,0 +1,3 @@
+Exit -> XBMC        : killall -9 vdr-sxfe
+Reboot              : reboot
+PowerOff            : poweroff -f

packages/addons/service/multimedia/vdr-addon/config/settings.xml

@@ -15,4 +15,7 @@
     <setting id="ENABLE_ROTORNG" value="false" />
     <setting id="ENABLE_EPGSEARCH" value="false" />
     <setting id="SOFTCAM_PLUGIN" value="sc" />
+    <setting id="ENABLE_TEXT2SKIN" value="false" />
+    <setting id="ENABLE_XINELIBOUTPUT" value="false" />
+    <setting id="XINELIBOUTPUT_PORT" value="37890" />
 </settings>

packages/addons/service/multimedia/vdr-addon/meta

@@ -21,13 +21,13 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="2.1"
-PKG_REV="5"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-xmltv2vdr"
+PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-xmltv2vdr vdr-xineliboutput vdr-text2skin vdr-skinanthra_1280_OS"
 PKG_PRIORITY="optional"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"

packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start

@@ -35,6 +35,7 @@ ADDON_PLUGIN_DIR="$ADDON_DIR/plugin"
 ADDON_VIDEO_DIR="$HOME/videos"
 
 if [ ! -f "$ADDON_SETTINGS" ]; then
+  mkdir -p $ADDON_HOME
   cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
 fi
 
@@ -81,6 +82,12 @@ 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"
@@ -94,6 +101,20 @@ fi
   mkdir -p $ADDON_CONFIG_DIR/plugins/live
   cp -PR plugins/live/* $ADDON_CONFIG_DIR/plugins/live
 
+  # copy vdr theme
+  if [ ! -d "$ADDON_CONFIG_DIR/plugins/text2skin/" ]; then
+    mkdir -p $ADDON_CONFIG_DIR/plugins/text2skin/
+    cp -a plugins/text2skin $ADDON_CONFIG_DIR/plugins/
+    cp -a themes $ADDON_CONFIG_DIR/
+
+    # is this in conflict with something else?
+    cat >$ADDON_CONFIG_DIR/setup.conf << MYDATA
+OSDSkin = anthra_1280_OS
+OSDTheme = yabluelight
+xineliboutput.OSD.Blending = 1
+MYDATA
+  fi
+
   for dir in `find . -type d`; do
     mkdir -p $ADDON_CONFIG_DIR/$dir
   done

packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml

@@ -10,17 +10,20 @@
 	<string id="1032">Enable plugin: streamdev-client</string>
 	<string id="1033">Enable plugin: streamdev-server</string>
 	<string id="1034">Enable plugin: wirbelscan</string>
+	<string id="1035">Enable plugin: dynamite</string>
+	<string id="1036">Enable softcam</string>
+	<string id="1037">softcam plugin</string>
 	<string id="1038">Enable plugin: live</string>
 	<string id="1039">live: listen on ip</string>
 	<string id="1040">live: listen on port</string>
+	<string id="1041">Enable plugin: rotorng</string>
 	<string id="1042">Enable plugin: control</string>
 	<string id="1043">control: listen on port</string>
-	<string id="1041">Enable plugin: rotorng</string>
 	<string id="1044">Enable plugin: epgsearch</string>
 	<string id="1045">Enable plugin: xmltv2vdr</string>
-	<string id="1035">Enable plugin: dynamite</string>
 	<string id="1046">Enable epgdata.com</string>
 	<string id="1047">epgdata.com PIN</string>
-	<string id="1036">Enable softcam</string>
-	<string id="1037">softcam plugin</string>
+	<string id="1048">Enable plugin: xineliboutput</string>
+	<string id="1049">xineliboutput: listen on port</string>
+	<string id="1050">Enable plugin: text2skin</string>
 </strings>

packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml

@@ -23,6 +23,9 @@
 		<setting id="ENABLE_XMLTV2VDR" type="bool" label="1045" default="false" />
 		<setting id="ENABLE_EPGDATA" type="bool" label="1046" default="false" />
 		<setting id="EPGDATA_PIN" type="number" label="1047" values="" enable="!eq(-1,false)"  default="1234"/>
+		<setting id="ENABLE_XINELIBOUTPUT" type="bool" label="1048" default="false" />
+		<setting id="XINELIBOUTPUT_PORT" type="number" label="1049" values="" enable="!eq(-1,false)"  default="37890"/>
+		<setting id="ENABLE_TEXT2SKIN" type="bool" label="1050" default="false" />
 		<setting id="ENABLE_DYNAMITE" type="bool" label="1035" default="true" />
 		<setting type="sep" />
 		<setting id="ENABLE_SOFTCAM" type="bool" label="1036" default="true" />