config/version: set version to 3.2.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>

.gitignore

@@ -26,5 +26,3 @@ mkpkg-temp
 # backup files
 *.orig
 
-# crap
-.DS_Store

CHANGELOG

@@ -1,13 +1,3 @@
-OpenELEC CHANGELOG
-==================
+for a changelog see:
 
-To view recent changes/commits to the project (master branch) please visit:
-
-https://github.com/OpenELEC/OpenELEC.tv/commits/master
-
-To compare commits between versions use a formatted URL like:
-
-https://github.com/OpenELEC/OpenELEC.tv/compare/3.2.3...3.2.4
-
-If you have questions on differences between releases please ask them in the
-OpenELEC website forums or IRC support channel.
+https://github.com/OpenELEC/OpenELEC.tv/commits/openelec-3.2

CONTRIBUTING.md

@@ -35,19 +35,6 @@ Feature requests are great, but they usually end up lying around the issue
 tracker indefinitely. Sending a pull request is a much better way of getting a
 particular feature into OpenELEC.
 
-Please dont ask us to add 3rdparty drivers unless you are the maintainer/developer of the driver,
-we have no manpower to support a non-mainlined kernel driver for your hardware.
-However, OpenELEC comes with minimal set of kernel drivers enabled, if you are sure that your hardware
-is supported in mainline kernel, feel free to send us a Pull Request to enable it in our
-kernel defconfigs. We are always happy to support known-working hardware.
-
-### Reporting build failures
-
-As buildsystem / core packages (toolchain) / random libraries change from time to time, it is required
-that you always do a clean build (make clean) before reporting build failures. Also make sure that you
-have a clean, unmodified git clone, we can't fix bugs caused by you failed to merge / rebase on
-your own fork.
-
 ### Pull Requests
 
 - **Create topic branches**. Don't ask us to pull from your master branch.

Makefile

@@ -1,6 +1,6 @@
 BUILD_DIRS=build.*
 
-all: release
+all: system
 
 system:
 	./scripts/image
@@ -8,12 +8,6 @@ system:
 release:
 	./scripts/image release
 
-image:
-	./scripts/image mkimage
-
-image-efi:
-	./scripts/image mkimage efi
-
 noobs:
 	./scripts/image noobs
 

README.md

@@ -64,6 +64,8 @@ providing cutting edge hardware support to deliver a set-top box experience.
   SSH allows command line access to your openelec.tv machine for configuration
   and file transfer. Linux/Mac clients can natively use SSH, while Windows
   users might want to try PuTTY for their terminal access.
+  Starting with OpenELEC 2.0, SSH is disabled by default but all that is needed
+  is an empty “ssh_enable” file to exist in /storage/.config to enable it.
 * $HOME is mounted on /storage (the second ext4 partition on the drive). 
   All data transfered to the machine will go here, the rest of the system is
   read-only with the exception of /var (containing runtime configuration data).

TODO

@@ -1,8 +1,2 @@
 ncurses-5.8/5.9:
   - segfaults in nano and dialog -> using ncurses-5.7
-
-irserver:
-  - rework irserver/init.d for systemd
-
-settings addon:
-  - remove ps3 sleep? should be fixed in bluez 5.13/5.14

config/addon/addon.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="@PKG_ADDON_ID@"
+       name="@PKG_NAME@"
+       version="@ADDON_VERSION@"
+       provider-name="@PROVIDER_NAME@">
+  <requires>
+    <import addon="os.openelec.tv" version="@OS_VERSION@"/>
+    <import addon="xbmc.python" version="2.0"/>
+@REQUIRES@
+  </requires>
+  <extension point="@PKG_ADDON_TYPE@"
+             library="default.py">
+        <provides>executable</provides>
+  </extension>
+  <extension point="xbmc.addon.metadata">
+    <summary>@PKG_SHORTDESC@</summary>
+    <description>
+@PKG_LONGDESC@
+    </description>
+    <disclaimer>
+@PKG_DISCLAIMER@
+    </disclaimer>
+    <platform>all</platform>
+  </extension>
+</addon>

config/addon/xbmc.python.module.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
-       version="@ADDON_VERSION@"
-       provider-name="@PROVIDER_NAME@">
-  <requires>
-    <import addon="os.openelec.tv" version="@OS_VERSION@"/>
-    <import addon="xbmc.python" version="2.1.0"/>
-@REQUIRES@
-  </requires>
-  <extension point="xbmc.python.module" library="lib/">
-  </extension>
-  <extension point="xbmc.addon.metadata">
-    <summary>@PKG_SHORTDESC@</summary>
-    <description>
-@PKG_LONGDESC@
-    </description>
-    <disclaimer>
-@PKG_DISCLAIMER@
-    </disclaimer>
-    <platform>all</platform>
-  </extension>
-</addon>

config/addon/xbmc.python.script.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
-       version="@ADDON_VERSION@"
-       provider-name="@PROVIDER_NAME@">
-  <requires>
-    <import addon="os.openelec.tv" version="@OS_VERSION@"/>
-    <import addon="xbmc.python" version="2.1.0"/>
-@REQUIRES@
-  </requires>
-  <extension point="xbmc.python.script" library="default.py">
-    <provides>executable</provides>
-  </extension>
-  <extension point="xbmc.addon.metadata">
-    <summary>@PKG_SHORTDESC@</summary>
-    <description>
-@PKG_LONGDESC@
-    </description>
-    <disclaimer>
-@PKG_DISCLAIMER@
-    </disclaimer>
-    <platform>all</platform>
-  </extension>
-</addon>

config/addon/xbmc.service.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
-       version="@ADDON_VERSION@"
-       provider-name="@PROVIDER_NAME@">
-  <requires>
-    <import addon="os.openelec.tv" version="@OS_VERSION@"/>
-    <import addon="xbmc.python" version="2.1.0"/>
-@REQUIRES@
-  </requires>
-  <extension point="xbmc.service" library="default.py">
-    <provides>executable</provides>
-  </extension>
-  <extension point="xbmc.addon.metadata">
-    <summary>@PKG_SHORTDESC@</summary>
-    <description>
-@PKG_LONGDESC@
-    </description>
-    <disclaimer>
-@PKG_DISCLAIMER@
-    </disclaimer>
-    <platform>all</platform>
-  </extension>
-</addon>

config/arch.arm

@@ -27,31 +27,28 @@
     arm1176jzf-s)
       TARGET_SUBARCH=armv6zk
       TARGET_ABI=eabi
-      TARGET_EXTRA_FLAGS="-mcpu=$TARGET_CPU"
+      TARGET_EXTRA_FLAGS="-Wno-psabi -Wa,-mno-warn-deprecated"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
       SIMD_SUPPORT="no"
       ;;
-    cortex-a7|cortex-a15)
+    cortex-a8)
       TARGET_SUBARCH=armv7-a
       TARGET_ABI=eabi
-      # It's not currently possible to specify the exact architecture variant (-mcpu)
-      # that A7/A15 supports in the command line so use -mtune here.
-      # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57907
-      TARGET_EXTRA_FLAGS="-mtune=$TARGET_CPU"
+      TARGET_EXTRA_FLAGS="-Wno-psabi -Wa,-mno-warn-deprecated"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
       SIMD_SUPPORT="yes"
       ;;
-    cortex-a5|cortex-a8|cortex-a9)
+    cortex-a9)
       TARGET_SUBARCH=armv7-a
       TARGET_ABI=eabi
-      TARGET_EXTRA_FLAGS="-mcpu=$TARGET_CPU"
+      TARGET_EXTRA_FLAGS="-Wno-psabi -Wa,-mno-warn-deprecated"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
       SIMD_SUPPORT="yes"
       ;;
   esac
 
 # setup ARCH specific *FLAGS
-  TARGET_CFLAGS="-march=$TARGET_SUBARCH -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated $TARGET_EXTRA_FLAGS"
+  TARGET_CFLAGS="-march=$TARGET_SUBARCH -mcpu=$TARGET_CPU -mabi=aapcs-linux $TARGET_EXTRA_FLAGS"
   [ -n "$TARGET_FPU" ] && TARGET_CFLAGS="$TARGET_CFLAGS $TARGET_FPU_FLAGS"
   TARGET_LDFLAGS="-march=$TARGET_SUBARCH -mtune=$TARGET_CPU"
   GCC_OPTS="--with-abi=aapcs-linux --with-arch=$TARGET_SUBARCH --with-float=$TARGET_FLOAT --with-fpu=$TARGET_FPU"

config/functions

@@ -1,9 +1,12 @@
 setup_toolchain() {
+  if [ "$1" = "--optimize" ]; then
+    OPTIMIZE=yes
+    shift
+  fi
+
   if [ "$1" = target ]; then
     export DESTIMAGE="target"
 
-    unset CPP
-
     export CC=$TARGET_CC
     export CXX=$TARGET_CXX
     export LD=$TARGET_LD
@@ -28,8 +31,6 @@ setup_toolchain() {
   elif [ "$1" = host ]; then
     export DESTIMAGE="host"
 
-    unset CPP
-
     export AWK=$HOST_AWK
     export CC=$HOST_CC
     export CXX=$HOST_CXX
@@ -55,45 +56,7 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
-  echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
-}
-
-kernel_version() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
-  echo ${PKG_VERSION}
-}
-
-# get kernel module dir
-get_module_dir() {
-  basename $(ls -d $(get_build_dir linux)/.install_pkg/lib/modules/*)
-}
-
-# get package's build dir
-get_build_dir() {
-  if [ ! -z $1 ] ; then
-    local _PKG_DIR=$(find $ROOT/projects/$PROJECT/packages -name $1 2>/dev/null)
-    if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
-      . $_PKG_DIR/package.mk
-    else
-      local _PKG_DIR=$(find $ROOT/packages -name $1 2>/dev/null)
-      if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
-        . $_PKG_DIR/package.mk
-      fi
-    fi
-
-    echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
-  fi
+  ls -d $ROOT/$BUILD/linux-*
 }
 
 tolower(){
@@ -114,6 +77,17 @@ require_cxx() {
   fi
 }
 
+xorg_drv_configure_prepend() {
+  incdir=${SYSROOT_PREFIX}/usr/include/xorg
+  for f in dri.h sarea.h dristruct.h exa.h damage.h xf86Module.h; do
+    incfile="$incdir/$f"
+    if [ -f "$incfile" ]; then
+      p=`echo "$incfile" | sed 'y%*+%pp%;s%[^_[:alnum:]]%_%g'`
+      eval "export ac_cv_file_$p=yes"
+    fi
+  done
+}
+
 add_user() {
   # Usage: add_user "username" "password" "userid" "groupid" "description" "home" "shell"
   mkdir -p ${INSTALL}/etc
@@ -185,13 +159,14 @@ do_autoreconf() {
 
 strip_lto() {
   # strip out LTO optimization from *FLAGS
-  if [ -n "$GCC_OPTIM_LTO" ] ; then
-    CFLAGS=`echo $CFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
-    CXXFLAGS=`echo $CXXFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
-  fi
-  if [ -n "$LD_OPTIM_LTO" ] ; then
-    LDFLAGS=`echo $LDFLAGS | sed -e "s|$LD_OPTIM_LTO||g"`
-  fi
+  CFLAGS=`echo $CFLAGS | sed -e "s|-flto||g"`
+  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-flto||g"`
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-flto||g"`
+}
+
+strip_linker_plugin() {
+  # strip out usage from linker plugin
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||g"`
 }
 
 strip_gold() {
@@ -216,22 +191,6 @@ fix_module_depends() {
   rm new.modinfo*
 }
 
-# Usage: enable_service <unit> [target]
-enable_service () {
-  local unit="$1"
-  local unit_dir="/usr/lib/systemd/system"
-  local target="$2"
-  local target_dir=$INSTALL
-
-  [ -f "$target_dir/$unit_dir/$unit" ] || exit 1
-  [ -z "$target" ] && target=`grep '^WantedBy' $target_dir/$unit_dir/$unit | cut -f2 -d=`
-
-  if [ -n "$target" ]; then
-    mkdir -p ${target_dir}/$unit_dir/${target}.wants
-    ln -sf ../${unit} ${target_dir}/$unit_dir/${target}.wants/
-  fi
-}
-
 check_path() {
 dashes="==========================="
   if [ "${PWD##/usr}" != "${PWD}" ]; then
@@ -277,9 +236,6 @@ dashes="==========================="
 }
 
 show_config() {
-  # load graphic configuration
-    get_graphicdrivers
-
   dashes="==========================="
   config_message="$config_message\n $dashes$dashes$dashes"
   config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "unofficial"))"
@@ -315,16 +271,17 @@ show_config() {
   config_message="$config_message\n - OpenGLES support (provider):\t\t $OPENGLES_SUPPORT ($OPENGLES)"
   config_message="$config_message\n - WindowManager:\t\t\t $WINDOWMANAGER"
   config_message="$config_message\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS"
-  config_message="$config_message\n - uvesafb support:\t\t\t $UVESAFB_SUPPORT"
 
   # Hardware decoder support
 
   config_message="$config_message\n\n Hardware decoder configuration:"
   config_message="$config_message\n $dashes$dashes"
 
-  config_message="$config_message\n - Kodi Player driver:\t\t\t $KODIPLAYER_DRIVER"
-  config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI_SUPPORT"
-  config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU_SUPPORT"
+  config_message="$config_message\n - Broadcom CrystalHD Decoder:\t\t $CRYSTALHD"
+  config_message="$config_message\n - XBMC Player driver:\t\t\t $XBMCPLAYER_DRIVER"
+  config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI"
+  config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU"
+  config_message="$config_message\n - XVBA Support:\t\t\t $XVBA"
 
   # Input device configuration
 
@@ -335,7 +292,7 @@ show_config() {
   config_message="$config_message\n - ATV Remote support:\t\t\t $ATVCLIENT_SUPPORT"
   config_message="$config_message\n - CEC Adapter support:\t\t\t $CEC_SUPPORT"
   config_message="$config_message\n - IRTrans support:\t\t\t $IRSERVER_SUPPORT"
-  config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT"
+  config_message="$config_message\n - XBMC Joystick support:\t\t $JOYSTICK_SUPPORT"
 
   # Misc. hardware configuration
 
@@ -344,6 +301,7 @@ show_config() {
 
   config_message="$config_message\n - ALSA support:\t\t\t $ALSA_SUPPORT"
   config_message="$config_message\n - Pulseaudio support:\t\t\t $PULSEAUDIO_SUPPORT"
+  config_message="$config_message\n - Blu-Ray support:\t\t\t $BLURAY_SUPPORT"
   config_message="$config_message\n - Bluetooth support:\t\t\t $BLUETOOTH_SUPPORT"
   config_message="$config_message\n - Hardware Sensors support:\t\t $SENSOR_SUPPORT"
   config_message="$config_message\n - LCD drivers:\t\t\t\t $LCD_DRIVER"
@@ -356,22 +314,22 @@ show_config() {
     config_message="$config_message\n - Include firmware:\t\t\t $config_firmware"
   done
 
-  for config_modules in $INITRAMFS_MODULES; do
-    config_message="$config_message\n - Initramfs modules:\t\t\t $config_modules"
-  done
-
   # Network service configuration
 
   config_message="$config_message\n\n Network service configuration:"
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - Avahi (Zeroconf) support:\t\t $AVAHI_DAEMON"
-  config_message="$config_message\n - NFS mounting support:\t\t $NFS_SUPPORT"
-  config_message="$config_message\n - SAMBA mounting support:\t\t $SAMBA_SUPPORT"
   config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER"
   config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER"
   config_message="$config_message\n - PPTP support:\t\t\t $PPTP_SUPPORT"
   config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
+  config_message="$config_message\n - XBMC Airplay support:\t\t $AIRPLAY_SUPPORT"
+  config_message="$config_message\n - XBMC Airtunes support:\t\t $AIRTUNES_SUPPORT"
+  config_message="$config_message\n - XBMC AFP support:\t\t\t $AFP_SUPPORT"
+  config_message="$config_message\n - XBMC NFS support:\t\t\t $NFS_SUPPORT"
+  config_message="$config_message\n - XBMC SAMBA client support:\t\t $SAMBA_SUPPORT"
+  config_message="$config_message\n - XBMC Webserver support:\t\t $WEBSERVER"
 
   # OS configuration
 
@@ -379,6 +337,7 @@ show_config() {
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - OEM Support:\t\t\t\t $OEM_SUPPORT"
+  config_message="$config_message\n - Default Hostname:\t\t\t $HOSTNAME"
   config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD"
   config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER"
 if [ "$BOOTLOADER" = "u-boot" ]; then
@@ -386,6 +345,8 @@ if [ "$BOOTLOADER" = "u-boot" ]; then
   config_message="$config_message\n - U-Boot config file:\t\t\t $UBOOT_CONFIGFILE"
 fi
   config_message="$config_message\n - UDevil support:\t\t\t $UDEVIL"
+  config_message="$config_message\n - Parted support:\t\t\t $PARTED"
+  config_message="$config_message\n - UPower support:\t\t\t $UPOWER"
   config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
 
   # Misc. Filesystems
@@ -401,37 +362,24 @@ fi
   config_message="$config_message\n - NTFS Support (via Fuse):\t\t $NTFS3G"
   config_message="$config_message\n - Install HFS Tools:\t\t\t $HFSTOOLS"
 
-  # Kodi configuration
+  # XBMC configuration
 
-  config_message="$config_message\n\n Kodi configuration:"
+  config_message="$config_message\n\n XBMC configuration:"
   config_message="$config_message\n $dashes$dashes"
 
-  config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER"
-  config_message="$config_message\n - Kodi nonfree support:\t\t $KODI_NONFREE_SUPPORT"
-  config_message="$config_message\n - Kodi Blu-Ray support:\t\t $KODI_BLURAY_SUPPORT"
-  config_message="$config_message\n - Bluray BD+ support:\t\t\t $BLURAY_BDPLUS_SUPPORT"
-  config_message="$config_message\n - Bluray AACS support:\t\t\t $BLURAY_AACS_SUPPORT"
-  config_message="$config_message\n - Kodi DVDCSS support:\t\t\t $KODI_DVDCSS_SUPPORT"
-  config_message="$config_message\n - Kodi Airplay support:\t\t $KODI_AIRPLAY_SUPPORT"
-  config_message="$config_message\n - Kodi Airtunes support:\t\t $KODI_AIRTUNES_SUPPORT"
-  config_message="$config_message\n - Kodi NFS support:\t\t\t $KODI_NFS_SUPPORT"
-  config_message="$config_message\n - Kodi MySQL support:\t\t\t $KODI_MYSQL_SUPPORT"
-  config_message="$config_message\n - Kodi Optical Drive support:\t\t $KODI_OPTICAL_SUPPORT"
-  config_message="$config_message\n - Kodi SAMBA client support:\t\t $KODI_SAMBA_SUPPORT"
-  config_message="$config_message\n - Kodi SSH client support:\t\t $KODI_SSHLIB_SUPPORT"
-  config_message="$config_message\n - Kodi UPNP support:\t\t\t $KODI_UPNP_SUPPORT"
-  config_message="$config_message\n - Kodi Webserver support:\t\t $KODI_WEBSERVER_SUPPORT"
-
+  config_message="$config_message\n - XBMC version:\t\t\t $MEDIACENTER"
+  config_message="$config_message\n - XBMC nonfree support:\t\t $NONFREE_SUPPORT"
+  config_message="$config_message\n - XBMC DVDCSS support:\t\t\t $DVDCSS_SUPPORT"
 
   for config_skin in $SKINS; do
     config_message="$config_message\n - Include Skin:\t\t\t $config_skin"
   done
 
   config_message="$config_message\n - Default Skin:\t\t\t $SKIN_DEFAULT"
-  config_message="$config_message\n - Include extra fonts:\t\t\t $KODI_EXTRA_FONTS"
-  config_message="$config_message\n - Include RSXS Screensaver:\t\t $KODI_SCR_RSXS"
-  config_message="$config_message\n - Include ProjectM Visualization:\t $KODI_VIS_PROJECTM"
-  config_message="$config_message\n - Include Goom Visualization:\t\t $KODI_VIS_GOOM"
+  config_message="$config_message\n - Include extra fonts:\t\t\t $XBMC_EXTRA_FONTS"
+  config_message="$config_message\n - Include RSXS Screensaver:\t\t $XBMC_SCR_RSXS"
+  config_message="$config_message\n - Include ProjectM Visualization:\t $XBMC_VIS_PROJECTM"
+  config_message="$config_message\n - Include Goom Visualization:\t\t $XBMC_VIS_GOOM"
 
   config_message="$config_message\n"
   config_message="$config_message\n $dashes$dashes$dashes"

config/graphic

@@ -1,4 +1,4 @@
-if [ "$DISPLAYSERVER" = "x11" ]; then
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
   SDL_SUPPORT="yes"
 else
   SDL_SUPPORT="no"
@@ -21,14 +21,14 @@ if [ "$SDL_SUPPORT" = no ]; then
 fi
 
 if [ "$OPENGL_SUPPORT" = no ]; then
-  KODI_SCR_RSXS="no"
-  KODI_VIS_PROJECTM="no"
-  KODI_VIS_GOOM="no"
+  XBMC_SCR_RSXS="no"
+  XBMC_VIS_PROJECTM="no"
+  XBMC_VIS_GOOM="no"
 fi
 
 get_graphicdrivers() {
   if [ "$GRAPHIC_DRIVERS" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia"
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx fglrx-legacy nvidia vmware virtualbox"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do
@@ -36,68 +36,85 @@ get_graphicdrivers() {
       XORG_DRIVERS="$XORG_DRIVERS dove"
     fi
 
+    if [ "$drv" = "fglrx" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS fglrx"
+      COMPOSITE_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "fglrx-legacy" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS fglrx-legacy"
+      COMPOSITE_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
+    fi
+
     if [ "$drv" = "i915" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i915"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
       XORG_DRIVERS="$XORG_DRIVERS intel"
       COMPOSITE_SUPPORT="yes"
-      VAAPI_SUPPORT="yes"
+#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "i965" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i965"
       XORG_DRIVERS="$XORG_DRIVERS intel"
       COMPOSITE_SUPPORT="yes"
-      VAAPI_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nouveau" ]; then
-      # DRI_DRIVERS are only used for NV04 - NV20 (which we dont want to support anymore)
-      DRI_DRIVERS="$DRI_DRIVERS"
-      # GALLIUM_DRIVERS are used for all cards from NV30 to nvc0
-      # see also http://nouveau.freedesktop.org/wiki/MesaDrivers/
+#      DRI_DRIVERS="$DRI_DRIVERS,nouveau"
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
       XORG_DRIVERS="$XORG_DRIVERS nouveau"
-      COMPOSITE_SUPPORT="yes"
+#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nvidia" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia"
-      VDPAU_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nvidia-legacy" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
-      VDPAU_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "virtualbox" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,swrast"
+      XORG_DRIVERS="$XORG_DRIVERS virtualbox"
+      XINERAMA_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "omapfb" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,swrast"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
+      XORG_DRIVERS="$XORG_DRIVERS ompafb"
+#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r200" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,r200"
       XORG_DRIVERS="$XORG_DRIVERS ati"
-      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r300" ]; then
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
-      COMPOSITE_SUPPORT="yes"
-      VDPAU_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r600" ]; then
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
-      COMPOSITE_SUPPORT="yes"
-      VDPAU_SUPPORT="yes"
     fi
 
-    if [ "$drv" = "radeonsi" ]; then
-      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,radeonsi"
-      XORG_DRIVERS="$XORG_DRIVERS ati"
-      LLVM_SUPPORT="yes"
-      COMPOSITE_SUPPORT="yes"
-      VDPAU_SUPPORT="yes"
+    if [ "$drv" = "vmware" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,swrast"
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga"
+      XORG_DRIVERS="$XORG_DRIVERS vmware"
+      XINERAMA_SUPPORT="yes"
+#      LLVM_SUPPORT="yes"
     fi
 
   done

config/noobs/partitions.json

@@ -1,15 +1,15 @@
 {
   "partitions": [
     {
-      "label":                     "@DISTRONAME@System",
+      "label":                     "System",
       "filesystem_type":           "FAT",
-      "partition_size_nominal":    160,
+      "partition_size_nominal":    128,
       "want_maximised":            false,
-      "uncompressed_tarball_size": 120,
+      "uncompressed_tarball_size": 110,
       "mkfs_options":              ""
     },
     {
-      "label":                     "@DISTRONAME@Storage",
+      "label":                     "Storage",
       "filesystem_type":           "ext4",
       "partition_size_nominal":    864,
       "want_maximised":            true,

config/optimize

@@ -1,20 +1,36 @@
+if [ "$OPTIMIZATIONS" = fast ];then
+  GCC_OPTIM="-Ofast"
+  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
+  LD_OPTIM="-Wl,--as-needed"
+fi
+
+if [ "$OPTIMIZATIONS" = speed ];then
+  GCC_OPTIM="$GCC_OPTIM -O3"
+  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
+  GCC_OPTIM="$GCC_OPTIM -ffast-math"
+  LD_OPTIM="-Wl,--as-needed"
+fi
+
 if [ "$OPTIMIZATIONS" = normal ];then
-  GCC_OPTIM="-O2"
+  GCC_OPTIM="$GCC_OPTIM -O2"
   LD_OPTIM=""
 fi
 
 if [ "$OPTIMIZATIONS" = size ];then
-  GCC_OPTIM="-Os -fexcess-precision=fast"
+  GCC_OPTIM="$GCC_OPTIM -Os"
+  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
+  GCC_OPTIM="$GCC_OPTIM -ffast-math"
   LD_OPTIM="-Wl,--as-needed"
 fi
 
 if [ "$LTO_SUPPORT" = yes ];then
-  GCC_OPTIM_LTO="-flto -ffat-lto-objects"
-  LD_OPTIM_LTO="-fuse-linker-plugin -flto"
+  GCC_OPTIM="$GCC_OPTIM -flto"
+  LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
+  LD_OPTIM="$LD_OPTIM -flto"
 fi
 
 if [ "$GOLD_SUPPORT" = yes ];then
-  LD_OPTIM_GOLD="-fuse-ld=gold"
+  LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
 fi
 
 if [ "$DEBUG" = yes ]; then
@@ -28,9 +44,9 @@ else
 fi
 
 TARGET_CPPFLAGS=
-TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $GCC_OPTIM_LTO $PROJECT_CFLAGS"
+TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
 TARGET_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $GCC_OPTIM"
 TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
 TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
 
@@ -40,11 +56,6 @@ HOST_CXXFLAGS="$HOST_CFLAGS"
 HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
 HOST_LIBDIR="$ROOT/$TOOLCHAIN/lib"
 
-# work around Ubuntu default C*FLAGS 
-# see https://wiki.ubuntu.com/ToolChain/CompilerFlags#A-Wformat_-Wformat-security
-HOST_CFLAGS="$HOST_CFLAGS -Wno-format-security"
-HOST_CXXFLAGS="$HOST_CXXFLAGS -Wno-format-security" 
-
 # add distro specific library dirs
   # ubuntu/debian specific "multiarch support"
     FAMILY_TRIPLET=$(echo $HOST_NAME | sed -e "s,$(uname -m),$(uname -i),")

config/options

@@ -1,14 +1,6 @@
 # set default language for buildsystem
   export LC_ALL=C
 
-# determines DISTRO, if not forced by user
-# default is OpenELEC
-if [ -z "$DISTRO" ]; then
-  DISTRO="OpenELEC"
-else
-  DISTRO="$DISTRO"
-fi
-
 # determines PROJECT, if not forced by user
 # default is Generic
 if [ -z "$PROJECT" ]; then
@@ -26,28 +18,22 @@ else
 fi
 
 ROOT=`pwd`
-DISTRO_DIR="$ROOT/distributions"
 PROJECT_DIR="$ROOT/projects"
-LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/packages/linux/package.mk"
 
 # include versioning
   . config/version
 
-# read distro versioning if available
- if [ -f "$DISTRO_DIR/$DISTRO/version" ]; then
-   . $DISTRO_DIR/$DISTRO/version
- fi
-
-# read distro options if available
- if [ -f "$DISTRO_DIR/$DISTRO/options" ]; then
-   . $DISTRO_DIR/$DISTRO/options
- fi
-
 # read project options if available
  if [ -f "$PROJECT_DIR/$PROJECT/options" ]; then
    . $PROJECT_DIR/$PROJECT/options
  fi
 
+# Target system library C (eglibc)
+  TARGET_LIBC="eglibc"
+
+# Library strip
+  LIBSTRIP="yes"
+
 # Need to point to your actual cc
 # If you have ccache installed, take care that LOCAL_CC don't point to it
   LOCAL_CC=`which gcc`
@@ -65,9 +51,7 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
 # Concurrency make level (-j option)
 #  Try value 1 (default) to 4 on single CPU computer, or more on
 #  multi-processor computer (like hyperthreading SMP CPU)
-  if test -z "${CONCURRENCY_MAKE_LEVEL}"; then
-    CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
-  fi
+  CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
 
 # cache size for ccache
 # Set the maximum size of the files stored in the cache. You can specify a
@@ -92,10 +76,5 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
     . $HOME/.openelec/$PROJECT/options
   fi
 
-# read distro options from $HOME if available
-  if [ -f "$HOME/.openelec/options.$DISTRO" ]; then
-    . $HOME/.openelec/options.$DISTRO
-  fi
-
 . config/graphic
 . config/path $1

config/path

@@ -1,7 +1,5 @@
 set -e
 
-. config/functions
-
 # setup initial directorys (relative to root)
   CONFIG=config
   SCRIPTS=scripts
@@ -20,10 +18,6 @@ HOST_NAME=`$LOCAL_CC -dumpmachine`
 TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI}
 
 BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION
-if [ -n "$BUILD_SUFFIX" ]; then
-  BUILD=$BUILD-$BUILD_SUFFIX
-fi
-
 TARGET_IMG=$ROOT/$TARGET
 TARGET_ADDONS="$TARGET_IMG/$ADDONS/$ADDON_PATH"
 ADDON_BUILD="$BUILD/$ADDONS/$1"
@@ -41,7 +35,6 @@ FAKEROOT_SCRIPT=$ROOT/.fakeroot.$PROJECT.$TARGET_ARCH
 if [ -z "$INSTALL" ]; then
   INSTALL=$BUILD/image/system
 fi
-INSTALL_INIT=$BUILD/image/initramfs/root-image
 
 . config/sources
 
@@ -57,10 +50,8 @@ SED="sed -i"
   PKG_LICENSE="unknown"
   PKG_SITE=""
   PKG_URL=""
-  PKG_DEPENDS_TARGET=""
-  PKG_DEPENDS_HOST=""
-  PKG_DEPENDS_INIT=""
-  PKG_DEPENDS_BOOTSTRAP=""
+  PKG_DEPENDS=""
+  PKG_BUILD_DEPENDS=""
   PKG_PRIORITY="optional"
   PKG_SECTION=""
   PKG_SHORTDESC="$1 (autogenerated)"
@@ -68,57 +59,49 @@ SED="sed -i"
   PKG_IS_ADDON="no"
 
   if [ -n "$1" ]; then
-    _PKG_ROOT_NAME=$(echo $1 | cut -d: -f1)
-    _ALL_DIRS=""
-    _FOUND=0
-    PKG_DIR=""
-
-    # first check project folder for a package
-    for DIR in $(find $ROOT/projects/$PROJECT/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do
-      if [ -r "$DIR/package.mk" ]; then
-        # found first, set $PKG_DIR
+    FOUND=0
+    for DIR in $ROOT/`find $PACKAGES -type d -name $(echo $1| awk -F : '{print $1}') ! -wholename \*\/source\/\* 2>/dev/null` ; do
+      # keep track of dirs with meta for debugging
+      if [ -z "$ALL_DIRS" ] ; then
+        ALL_DIRS="$DIR"
+      else
+        ALL_DIRS="$ALL_DIRS\\n$DIR"
+      fi
+      if [ -f "$DIR/package.mk" -o -f "$DIR/meta" -o -f "$DIR/install" -o -f "$DIR/build" ] ; then
+        FOUND=$((FOUND+1))
+        # found first. set $PKG_DIR
         PKG_DIR="$DIR"
-        # keep track of dirs with package.mk for detecting multiple folders
-        _ALL_DIRS="${_ALL_DIRS}${DIR}\\n"
-        _FOUND=$((_FOUND+1))
-        if [ $_FOUND -gt 1 ]; then
-          # _FOUND more ? fail
+        if [ $FOUND -gt 1 ] ; then
+          # found more ? fail
           echo "Error - multiple package folders:"
-          echo -e "$_ALL_DIRS"
+          echo -e "$ALL_DIRS"
           exit 1
         fi
       fi
     done
-
-    # then check packages folder if not found already
-    if [ $_FOUND -eq 0 ]; then
-      for DIR in $(find $ROOT/$PACKAGES -type d -name $_PKG_ROOT_NAME 2>/dev/null); do
-        if [ -r "$DIR/package.mk" ]; then
-          # found first, set $PKG_DIR
-          PKG_DIR="$DIR"
-          # keep track of dirs with package.mk for detecting multiple folders
-          _ALL_DIRS="${_ALL_DIRS}${DIR}\\n"
-          _FOUND=$((_FOUND+1))
-          if [ $_FOUND -gt 1 ]; then
-            # found more ? fail
-            echo "Error - multiple package folders:"
-            echo -e "$_ALL_DIRS"
-            exit 1
-          fi
-        fi
-      done
-    fi
   fi
 
   if [ -r $PKG_DIR/package.mk ]; then
     . $PKG_DIR/package.mk
+  elif [ -r $PKG_DIR/meta ]; then
+    . $PKG_DIR/meta
   fi
 
   if [ "$PKG_IS_ADDON" = "yes" ] ; then
     [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
   fi
 
-  PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
+  if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}"
+  fi
 
 XORG_PATH_DRI=/usr/lib/dri
 XORG_PATH_XKB=/usr/share/X11/xkb
@@ -132,8 +115,6 @@ SSL_CERTIFICATES="/etc/pki/tls"
 TOOLCHAIN_LANGUAGES=c
 [ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++
 
-unset TARGET_CPP
-
 TARGET_CC=${TARGET_PREFIX}gcc
 TARGET_CXX=${TARGET_PREFIX}g++
 TARGET_LD=${TARGET_PREFIX}ld
@@ -151,8 +132,6 @@ TARGET_PKG_CONFIG_PATH=""
 TARGET_PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
 TARGET_PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
 
-unset HOST_CPP
-
 HOST_AWK=gawk
 HOST_CC=$ROOT/$TOOLCHAIN/bin/host-gcc
 HOST_CXX=$ROOT/$TOOLCHAIN/bin/host-g++
@@ -175,7 +154,7 @@ export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL
 export PKG_CONFIG=$ROOT/$TOOLCHAIN/bin/pkg-config
 
 if [ -z "$PATH" -o "$PATH" = "${PATH#$ROOT/$TOOLCHAIN/bin:}" ]; then
-  export PATH="$ROOT/$TOOLCHAIN/bin:$ROOT/$TOOLCHAIN/sbin:$PATH"
+  export PATH="$ROOT/$TOOLCHAIN/bin:$PATH"
 fi
 
 if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$ROOT/$TOOLCHAIN/lib:}" ]; then
@@ -183,6 +162,7 @@ if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$ROOT/$TOO
 fi
 
 VERSION_SUFFIX=$TARGET_ARCH
+. config/functions
 
 check_path
 check_config
@@ -200,28 +180,5 @@ else
 fi
 BUILD_INDENT_SIZE=4
 
-# define colors
-  black="\e[0;30m"
-  boldblack="\e[1;30m"
-  red="\e[0;31m"
-  boldred="\e[1;31m"
-  green="\e[0;32m"
-  boldgreen="\e[1;32m"
-  yellow="\e[0;33m"
-  boldyellow="\e[1;33m"
-  blue="\e[0;34m"
-  boldblue="\e[1;34m"
-  magenta="\e[0;35m"
-  boldmagenta="\e[1;35m"
-  cyan="\e[0;36m"
-  boldcyan="\e[1;36m"
-  white="\e[0;37m"
-  boldwhite="\e[1;37m"
-  endcolor="\e[0m"
-
 # multilib? nah
 unset CONFIG_SITE
-
-# meh suse
-unset PYTHONSTARTUP
-unset PYTHONPATH

config/version

@@ -1,9 +1,9 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="5.0.1"
+  OPENELEC_VERSION="3.2.0"
 
 # OS_VERSION: OS Version
-  OS_VERSION="5.0"
+  OS_VERSION="3.2"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="4.3"
+  ADDON_VERSION="3.1"
 

distributions/OpenELEC/options

@@ -1,236 +0,0 @@
-# Name of the Distro to build (full name, without special characters)
-  DISTRONAME="OpenELEC"
-
-# short project description
-  DESCRIPTION="OpenELEC is a fast and userfriendly Kodi Entertainment Center distribution."
-
-# Welcome Message for e.g. SSH Server (up to 5 Lines)
-  GREETING0="##############################################"
-  GREETING1="# OpenELEC - The living room PC for everyone #"
-  GREETING2="# ...... visit http://www.openelec.tv ...... #"
-  GREETING3="##############################################"
-  GREETING4=""
-
-# Root password to integrate in the target system
-  ROOT_PASSWORD="openelec"
-
-# Mediacenter to use (kodi / no)
-  MEDIACENTER="kodi"
-
-# Skins to install (Confluence)
-# Space separated list is supported,
-# e.g. SKINS="Confluence"
-  SKINS="Confluence"
-
-# Default Skin (Confluence)
-  SKIN_DEFAULT="Confluence"
-
-# install extra subtitle Fonts for KODI (yes / no)
-  KODI_EXTRA_FONTS="yes"
-
-# build and install 'RSXS' Screensaver (yes / no)
-  KODI_SCR_RSXS="yes"
-
-# build and install 'ProjectM' Visualization (yes / no)
-  KODI_VIS_PROJECTM="yes"
-
-# build and install 'GOOM' Visualization (yes / no)
-  KODI_VIS_GOOM="yes"
-
-# build and install 'Waveform' Visualization (yes / no)
-  KODI_VIS_WAVEFORM="yes"
-
-# build and install 'Spectrum' Visualization (yes / no)
-  KODI_VIS_SPECTRUM="yes"
-
-# build and install 'FishBMC' Visualization (yes / no)
-  # does not work on RPi
-  KODI_VIS_FISHBMC="yes"
-
-# build and install PulseAudio support (yes / no)
-  PULSEAUDIO_SUPPORT="no"
-
-# build and install espeak support (yes / no)
-  ESPEAK_SUPPORT="yes"
-
-# build and install with non-free support
-# (RAR compression support in KODI) (yes / no)
-  KODI_NONFREE_SUPPORT="yes"
-
-# build and install with BluRay support (yes / no)
-  KODI_BLURAY_SUPPORT="yes"
-
-# build and install with BD+ support
-# (BD+ decryption support in KODI) (yes / no)
-  BLURAY_BDPLUS_SUPPORT="yes"
-
-# build and install with AACS support
-# (BD decryption support in KODI) (yes / no)
-  BLURAY_AACS_SUPPORT="yes"
-
-# build and install with DVDCSS support
-# (DVD decryption support in KODI) (yes / no)
-  KODI_DVDCSS_SUPPORT="yes"
-
-# additional drivers to install:
-# for a list of additinoal drivers see packages/linux-drivers
-# Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8188EU RTL8812AU dvbhdhomerun"
-
-# build and install bluetooth support (yes / no)
-  BLUETOOTH_SUPPORT="yes"
-
-# build and install with KODI webfrontend (yes / no)
-  KODI_WEBSERVER_SUPPORT="yes"
-
-# build and install Avahi (Zeroconf) daemon (yes / no)
-  AVAHI_DAEMON="yes"
-
-# build with UPnP support (yes / no)
-  KODI_UPNP_SUPPORT="yes"
-
-# build with MySQL support (yes / no)
-  KODI_MYSQL_SUPPORT="yes"
-
-# build xbmc with sshlib support (yes / no)
-  KODI_SSHLIB_SUPPORT="yes"
-
-# build xbmc with optical drive support (yes / no)
-  KODI_OPTICAL_SUPPORT="yes"
-
-# KODI Audio encoders for usage with optical drive support
-# Space separated list is supported,
-# e.g. KODI_AUDIOENCODER_ADDONS="ENCODER1 ENCODER2"
-  KODI_AUDIOENCODER_ADDONS="flac lame vorbis wav"
-
-# build with AirPlay support (stream videos from iDevices to KODI) (yes / no)
-  KODI_AIRPLAY_SUPPORT="yes"
-
-# build with AirTunes support (stream music from iDevices to KODI) (yes / no)
-  KODI_AIRTUNES_SUPPORT="yes"
-
-# build with libnfs support (mounting nfs shares with KODI) (yes / no)
-  KODI_NFS_SUPPORT="yes"
-
-# build with Samba Client support (mounting SAMBA shares with KODI) (yes / no)
-  KODI_SAMBA_SUPPORT="yes"
-
-# build with NFS support (mounting nfs shares via the OS) (yes / no)
-  NFS_SUPPORT="yes"
-
-# build with Samba Client support (mounting samba shares via the OS) (yes / no)
-  SAMBA_SUPPORT="yes"
-
-# build and install Samba Server (yes / no)
-  SAMBA_SERVER="yes"
-
-# build and install SFTP Server (yes / no)
-  SFTP_SERVER="yes"
-
-# build and install PPP support (yes / no)
-  PPTP_SUPPORT="yes"
-
-# build and install OpenVPN support (yes / no)
-  OPENVPN_SUPPORT="yes"
-
-# build and install diskmounter support (udevil)
-# this service provide auto mounting support for external drives in the
-# mediacenter also automount internally drives at boottime via udev (yes / no)
-  UDEVIL="yes"
-
-# build and install exFAT fuse support (yes / no)
-  EXFAT="yes"
-
-# build and install NTFS-3G fuse support (yes / no)
-  NTFS3G="yes"
-
-# build and install hfs filesystem utilities (yes / no)
-  HFSTOOLS="yes"
-
-# Windowmanager to use (ratpoison / fluxbox / none)
-  WINDOWMANAGER="fluxbox"
-
-# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau)
-# Space separated list is supported,
-# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia nouveau"
-  if [ "$TARGET_ARCH" = "i386" ]; then
-    # TODO: create Legacy build with OpenELEC-4.2
-    # install legacy drivers to i386 ARCH
-    GRAPHIC_DRIVERS="r200 r300 r600 i915 i965 nvidia-legacy"
-  elif [ "$TARGET_ARCH" = "x86_64" ]; then
-    GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia"
-  fi
-
-# build and install remote support (yes / no)
-  REMOTE_SUPPORT="yes"
-
-# build and install ATV IR remote support (yes / no)
-  ATVCLIENT_SUPPORT="yes"
-
-# build and install IRServer IR/LCD support (yes / no)
-  IRSERVER_SUPPORT="yes"
-
-# build and install Joystick support (yes / no)
-  JOYSTICK_SUPPORT="yes"
-
-# build and install CEC adapter support (yes / no)
-  CEC_SUPPORT="yes"
-
-# build and install iSCSI support - iscsistart (yes / no)
-  ISCSI_SUPPORT="yes"
-
-# LCD driver to Use - Possible drivers are ( Comma seperated:
-# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,dm140,
-# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
-# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,
-# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,
-# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,
-# picolcd,pyramid,sed1330,sed1520,serialPOS,
-# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,vlsys_m428
-# 'all' compiles all drivers;
-# 'all,!xxx,!yyy' de-selects previously selected drivers
-# "none" for disable LCD support
-  LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428,serialVFD,shuttleVFD"
-
-# Support for partitioning and formating disks in initramfs (yes / no)
-# This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
-  INITRAMFS_PARTED_SUPPORT="no"
-
-# build with swap support (yes / no)
-  SWAP_SUPPORT="no"
-
-# swap support enabled per default (yes / no)
-  SWAP_ENABLED_DEFAULT="no"
-
-# swapfile size if SWAP_SUPPORT=yes in MB
-  SWAPFILESIZE="256"
-
-# build with installer (yes / no)
-  INSTALLER_SUPPORT="yes"
-
-# Testpackages for development (yes / no)
-  TESTING="no"
-
-# OEM packages for OEM's (yes / no)
-  OEM_SUPPORT="no"
-
-# build and install nano text editor (yes / no)
-  NANO_EDITOR="yes"
-
-# cron support (yes / no)
-  CRON_SUPPORT="yes"
-
-# Perf support in development builds (yes / no)
-  PERF_SUPPORT="yes"
-
-# Distribution Specific source location
-  DISTRO_MIRROR="http://sources.openelec.tv/mirror"
-  DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
-
-# Addon Server Url
-  ADDON_SERVER_URL="http://addons.openelec.tv"
-
-# set the addon dirs
-  ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
-  ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"

packages/3rdparty/graphics/libpng12/build

@@ -0,0 +1,34 @@
+#!/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
+
+cd $PKG_BUILD
+ac_cv_lib_z_zlibVersion=yes \
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-static \
+            --enable-shared
+
+make

packages/3rdparty/graphics/libpng12/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="libpng"
+PKG_VERSION="1.2.50"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.libpng.org/"
+PKG_URL="$SOURCEFORGE_SRC/libpng/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="zlib"
+PKG_BUILD_DEPENDS="toolchain zlib"
+PKG_PRIORITY="optional"
+PKG_SECTION="graphics"
+PKG_SHORTDESC="libpng: Portable Network Graphics (PNG) Reference Library - old 1.2 version"
+PKG_LONGDESC="PNG (Portable Network Graphics) is an extensible file format for the lossless, portable, well-compressed storage of raster images. PNG provides a patent-free replacement for GIF and can also replace many common uses of TIFF. Indexed-color, grayscale, and truecolor images are supported, plus an optional alpha channel. Sample depths range from 1 to 16 bits. Old 1.2 version."
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"

packages/3rdparty/graphics/libpng12/unpack

@@ -0,0 +1,27 @@
+#!/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
+
+TGZ_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
+
+  tar xJf $SOURCES/$1/$TGZ_PKG -C $BUILD >/dev/null 2>&1

packages/3rdparty/lib/cxxtools/build

@@ -0,0 +1,60 @@
+#!/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
+
+cd $PKG_BUILD
+
+setup_toolchain host
+
+mkdir -p .build-host && cd .build-host
+
+../configure --host=$HOST_NAME \
+            --build=$HOST_NAME \
+            --prefix=$ROOT/$TOOLCHAIN \
+            --disable-static \
+            --enable-shared \
+            --disable-demos \
+            --disable-unittest
+
+make
+make install
+
+cd ..
+
+setup_toolchain target
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+mkdir -p .build-target && cd .build-target
+../configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --enable-static \
+            --disable-shared \
+            --disable-demos \
+            --disable-unittest
+
+$MAKEINSTALL

packages/3rdparty/lib/cxxtools/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      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="cxxtools"
+PKG_VERSION="2.1.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL-2"
+PKG_SITE="http://www.tntnet.org/cxxtools.html"
+PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="python/web"
+PKG_SHORTDESC="cxxtools: a collection of general-purpose C++ classes"
+PKG_LONGDESC="Cxxtools is a collection of general-purpose C++ classes"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

packages/3rdparty/lib/cxxtools/package.mk

@@ -1,53 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-PKG_NAME="cxxtools"
-PKG_VERSION="2.2.1"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL-2"
-PKG_SITE="http://www.tntnet.org/cxxtools.html"
-PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST=""
-PKG_DEPENDS_TARGET="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="python/web"
-PKG_SHORTDESC="cxxtools: a collection of general-purpose C++ classes"
-PKG_LONGDESC="Cxxtools is a collection of general-purpose C++ classes"
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
-
-PKG_CONFIGURE_OPTS_HOST="--disable-demos --with-atomictype=pthread --disable-unittest"
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --disable-demos --with-atomictype=pthread --disable-unittest"
-
-pre_configure_target() {
-  CFLAGS="$CFLAGS -fPIC"
-  CXXFLAGS="$CXXFLAGS -fPIC"
-  LDFLAGS="$LDFLAGS -fPIC"
-}
-
-
-post_makeinstall_host() {
-  rm -rf $TOOLCHAIN/bin/cxxtools-config
-}
-
-post_makeinstall_target() {
-  rm -rf $SYSROOT_PREFIX/usr/bin/cxxtools-config
-  rm -rf $INSTALL/usr/bin
-}

packages/3rdparty/lib/cxxtools/patches/cxxtools-2.1.1-arm.patch

@@ -0,0 +1,278 @@
+diff --git a/src/bin/formatter.cpp b/src/bin/formatter.cpp
+index 020475e..516d145 100644
+--- a/src/bin/formatter.cpp
++++ b/src/bin/formatter.cpp
+@@ -218,7 +218,7 @@ void Formatter::addValueString(const std::string& name, const std::string& type,
+ 
+     if (type == "int")
+     {
+-        if (value.size() > 0 && (value[0] == L'-' || value[0] == L'+'))
++        if (value.size() > 0 && ( (int) value[0] == (int) L'-' || (int) value[0] == (int) L'+'))
+         {
+             int64_t v = convert<int64_t>(value);
+             printInt(*_out, v, name);
+diff --git a/src/csvparser.cpp b/src/csvparser.cpp
+index f9ee8dd..9d57dc8 100644
+--- a/src/csvparser.cpp
++++ b/src/csvparser.cpp
+@@ -76,23 +76,23 @@ void CsvParser::begin(DeserializerBase& handler)
+ 
+ void CsvParser::advance(Char ch)
+ {
+-    if (ch == L'\n')
++    if ( (int) ch == (int) L'\n')
+         ++_lineNo;
+ 
+     switch (_state)
+     {
+         case state_detectDelim:
+-            if (isalnum(ch) || ch == L'_' || ch == ' ')
++            if (isalnum(ch) || (int) ch == (int) L'_' || (int) ch == (int) ' ')
+             {
+                 _titles.back() += ch.narrow();
+             }
+-            else if (ch == L'\n' || ch == L'\r')
++            else if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
+             {
+                 log_debug("title=\"" << _titles.back() << '"');
+                 _noColumns = 1;
+-                _state = (ch == L'\r' ? state_cr : state_rowstart);
++                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
+             }
+-            else if (ch == L'\'' || ch == L'"')
++            else if ( (int) ch == (int) L'\'' || (int) ch == (int) L'"')
+             {
+                 _quote = ch;
+                 _state = state_detectDelim_q;
+@@ -119,17 +119,17 @@ void CsvParser::advance(Char ch)
+             break;
+ 
+         case state_detectDelim_postq:
+-            if (isalnum(ch) || ch == L'_' || ch == L'\'' || ch == L'"' || ch == L' ')
++            if (isalnum(ch) || (int) ch == (int) L'_' || (int) ch == (int) L'\'' || (int) ch == (int) L'"' || (int) ch == (int) L' ')
+             {
+                 std::ostringstream msg;
+                 msg << "invalid character '" << ch.narrow() << "' within csv title of column " << _titles.size();
+                 SerializationError::doThrow(msg.str());
+             }
+-            else if (ch == L'\n' || ch == L'\r')
++            else if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
+             {
+                 log_debug("title=\"" << _titles.back() << '"');
+                 _noColumns = 1;
+-                _state = (ch == L'\r' ? state_cr : state_rowstart);
++                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
+             }
+             else
+             {
+@@ -142,10 +142,10 @@ void CsvParser::advance(Char ch)
+             break;
+ 
+         case state_title:
+-            if (ch == L'\n' || ch == L'\r')
++            if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
+             {
+                 log_debug("title=\"" << _titles.back() << '"');
+-                _state = (ch == L'\r' ? state_cr : state_rowstart);
++                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
+                 _noColumns = _titles.size();
+             }
+             else if (ch == _delimiter)
+@@ -153,7 +153,7 @@ void CsvParser::advance(Char ch)
+                 log_debug("title=\"" << _titles.back() << '"');
+                 _titles.push_back(std::string());
+             }
+-            else if (ch == '\'' || ch == '\"')
++            else if ( (int) ch == (int) '\'' || (int) ch == (int) '\"')
+             {
+                 if (_titles.back().empty())
+                 {
+@@ -185,10 +185,10 @@ void CsvParser::advance(Char ch)
+             break;
+ 
+         case state_qtitlep:
+-            if (ch == L'\n' || ch == L'\r')
++            if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
+             {
+                 log_debug("title=\"" << _titles.back() << '"');
+-                _state = (ch == L'\r' ? state_cr : state_rowstart);
++                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
+                 _noColumns = _titles.size();
+             }
+             else if (ch == _delimiter)
+@@ -207,7 +207,7 @@ void CsvParser::advance(Char ch)
+ 
+         case state_cr:
+             _state = state_rowstart;
+-            if (ch == L'\n')
++            if ( (int) ch == (int) L'\n')
+             {
+                 break;
+             }
+@@ -228,14 +228,14 @@ void CsvParser::advance(Char ch)
+                 _column < _titles.size() ? _titles[_column] : std::string(),
+                 std::string(), SerializationInfo::Value);
+ 
+-            if (ch == L'\n' || ch == L'\r')
++            if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
+             {
+                 _deserializer->leaveMember();
+                 checkNoColumns(_column, _noColumns, _lineNo);
+                 _deserializer->leaveMember();
+-                _state = (ch == L'\r' ? state_cr : state_rowstart);
++                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
+             }
+-            else if (ch == L'"' || ch == L'\'')
++            else if ((int) ch == L'"' || (int) ch == L'\'')
+             {
+                 _quote = ch;
+                 _state = state_qdata;
+@@ -253,7 +253,7 @@ void CsvParser::advance(Char ch)
+             break;
+ 
+         case state_data0:
+-            if (ch == L'"' || ch == L'\'')
++            if ( (int) ch == (int) L'"' || (int) ch == (int) L'\'')
+             {
+                 _quote = ch;
+                 _state = state_qdata;
+@@ -261,7 +261,7 @@ void CsvParser::advance(Char ch)
+             }
+ 
+         case state_data:
+-            if (ch == L'\n' || ch == L'\r')
++            if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
+             {
+                 log_debug("value \"" << _value << '"');
+                 _deserializer->setValue(_value);
+@@ -269,7 +269,7 @@ void CsvParser::advance(Char ch)
+                 checkNoColumns(_column, _noColumns, _lineNo);
+                 _deserializer->leaveMember();  // leave data item
+                 _deserializer->leaveMember();  // leave row
+-                _state = (ch == L'\r' ? state_cr : state_rowstart);
++                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
+             }
+             else if (ch == _delimiter)
+             {
+@@ -307,11 +307,11 @@ void CsvParser::advance(Char ch)
+             break;
+ 
+         case state_qdata_end:
+-            if (ch == L'\n' || ch == L'\r')
++            if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
+             {
+                 checkNoColumns(_column, _noColumns, _lineNo);
+                 _deserializer->leaveMember();  // leave row
+-                _state = (ch == L'\r' ? state_cr : state_rowstart);
++                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
+             }
+             else if (ch == _delimiter)
+             {
+diff --git a/src/jsonformatter.cpp b/src/jsonformatter.cpp
+index 1604d3e..07ada52 100644
+--- a/src/jsonformatter.cpp
++++ b/src/jsonformatter.cpp
+@@ -323,25 +323,25 @@ void JsonFormatter::stringOut(const std::string& str)
+ {
+     for (std::string::const_iterator it = str.begin(); it != str.end(); ++it)
+     {
+-        if (*it == '"')
++        if ( (int) *it == (int) '"')
+             *_ts << L'\\'
+                 << L'\"';
+-        else if (*it == '\\')
++        else if ( (int) *it == (int) '\\')
+             *_ts << L'\\'
+                 << L'\\';
+-        else if (*it == '\b')
++        else if ( (int) *it == (int) '\b')
+             *_ts << L'\\'
+                 << L'b';
+-        else if (*it == '\f')
++        else if ( (int) *it == (int) '\f')
+             *_ts << L'\\'
+                 << L'f';
+-        else if (*it == '\n')
++        else if ( (int) *it == (int) '\n')
+             *_ts << L'\\'
+                 << L'n';
+-        else if (*it == '\r')
++        else if ( (int) *it == (int) '\r')
+             *_ts << L'\\'
+                 << L'r';
+-        else if (*it == '\t')
++        else if ( (int) *it == (int) '\t')
+             *_ts << L'\\'
+                 << L't';
+         else if (static_cast<unsigned char>(*it) >= 0x80 || static_cast<unsigned char>(*it) < 0x20)
+@@ -364,25 +364,25 @@ void JsonFormatter::stringOut(const cxxtools::String& str)
+ {
+     for (cxxtools::String::const_iterator it = str.begin(); it != str.end(); ++it)
+     {
+-        if (*it == L'"')
++        if ( (int) *it == (int) L'"')
+             *_ts << L'\\'
+                 << L'\"';
+-        else if (*it == L'\\')
++        else if ( (int) *it == (int) L'\\')
+             *_ts << L'\\'
+                 << L'\\';
+-        else if (*it == L'\b')
++        else if ( (int) *it == (int) L'\b')
+             *_ts << L'\\'
+                 << L'b';
+-        else if (*it == L'\f')
++        else if ( (int) *it == (int) L'\f')
+             *_ts << L'\\'
+                 << L'f';
+-        else if (*it == L'\n')
++        else if ( (int) *it == (int) L'\n')
+             *_ts << L'\\'
+                 << L'n';
+-        else if (*it == L'\r')
++        else if ( (int) *it == (int) L'\r')
+             *_ts << L'\\'
+                 << L'r';
+-        else if (*it == L'\t')
++        else if ( (int) *it == (int) L'\t')
+             *_ts << L'\\'
+                 << L't';
+         else if (it->value() >= 0x80 || it->value() < 0x20)
+diff --git a/src/xml/entityresolver.cpp b/src/xml/entityresolver.cpp
+index fb55f08..58ea86a 100644
+--- a/src/xml/entityresolver.cpp
++++ b/src/xml/entityresolver.cpp
+@@ -563,19 +563,19 @@ namespace
+ 
+ String EntityResolver::resolveEntity(const String& entity) const
+ {
+-    if (!entity.empty() && entity[0] == L'#')
++    if (!entity.empty() && (int) entity[0] == (int) L'#')
+     {
+         int code = 0;
+-        if (entity.size() > 2 && entity[1] == L'x')
++        if (entity.size() > 2 && (int) entity[1] == (int) L'x')
+         {
+             // hex notation: &#xABCD;
+             for (String::const_iterator it = entity.begin() + 2; it != entity.end(); ++it)
+             {
+-                if (*it >= L'0' && *it <= L'9')
++                if ( (int) *it >= (int) L'0' && (int) *it <= (int) L'9')
+                     code = code * 16 + (it->value() - L'0');
+-                else if (*it >= L'A' && *it <= L'F')
++                else if ( (int) *it >= (int) L'A' && (int) *it <= (int) L'F')
+                     code = code * 16 + (it->value() - L'A' + 10);
+-                else if (*it >= L'a' && *it <= L'f')
++                else if ( (int) *it >= (int) L'a' && (int) *it <= (int) L'f')
+                     code = code * 16 + (it->value() - L'a' + 10);
+                 else
+                     throw std::runtime_error(std::string("invalid entity ") + entity.narrow());
+@@ -586,7 +586,7 @@ String EntityResolver::resolveEntity(const String& entity) const
+             // dec notation: &#9999;
+             for (String::const_iterator it = entity.begin() + 1; it != entity.end(); ++it)
+             {
+-                if (*it >= L'0' && *it <= L'9')
++                if ( (int) *it >= (int) L'0' && (int) *it <= (int) L'9')
+                     code = code * 10 + (it->value() - '0');
+                 else
+                     throw std::runtime_error(std::string("invalid entity ") + entity.narrow());

packages/3rdparty/lib/cxxtools/patches/cxxtools-2.2-Char_operator_eq_unsigned_int.patch

@@ -1,17 +0,0 @@
-Index: cxxtools-2.2/include/cxxtools/char.h
-===================================================================
---- cxxtools-2.2.orig/include/cxxtools/char.h	2013-05-05 14:18:00.180572107 +0300
-+++ cxxtools-2.2/include/cxxtools/char.h	2013-05-05 14:18:00.176571966 +0300
-@@ -148,6 +148,12 @@
-             friend bool operator==(char a, const Char& b)
-             { return a == b.value(); }
- 
-+            //! @brief Returns $true$ if the a and b are the same character; $false$ otherwise.
-+            //! @return $true$ if the a and b are the same character; $false$ otherwise.
-+            friend bool operator==(const Char& a, unsigned int b)
-+            { return a.value() == b; }
-+
-+
-             //! @brief Returns $true$ if the a and b are not the same character; $false$ otherwise.
-             //! @return $true$ if the a and b are not the same character; $false$ otherwise.
-             friend bool operator!=(const Char& a, const Char& b)

packages/3rdparty/lib/cxxtools/patches/cxxtools-2.2-hdstream_stdio.patch

@@ -1,12 +0,0 @@
-Index: cxxtools-2.0/src/hdstream.cpp
-===================================================================
---- cxxtools-2.0.orig/src/hdstream.cpp	2011-08-08 13:07:59.567275994 +0300
-+++ cxxtools-2.0/src/hdstream.cpp	2011-08-08 13:08:11.447275959 +0300
-@@ -30,6 +30,7 @@
- #include <ios>
- #include <iomanip>
- #include <cctype>
-+#include <cstdio>
- 
- namespace cxxtools
- {

packages/3rdparty/lib/cxxtools/patches/cxxtools-2.2-no_shared_flag.patch

@@ -1,10 +0,0 @@
-Index: cxxtools-2.2/src/Makefile.am
-===================================================================
---- cxxtools-2.2.orig/src/Makefile.am	2013-05-05 13:56:03.225204926 +0300
-+++ cxxtools-2.2/src/Makefile.am	2013-05-05 13:56:14.017219885 +0300
-@@ -215,4 +215,4 @@
- endif
- 
- libcxxtools_la_LIBADD = $(LIBICONV)
--libcxxtools_la_LDFLAGS = -version-info @sonumber@ @SHARED_LIB_FLAG@
-+libcxxtools_la_LDFLAGS = -version-info @sonumber@

packages/3rdparty/lib/cxxtools/patches/cxxtools-crosscompile.patch

@@ -1,28 +0,0 @@
-diff -Naur cxxtools-2.2/configure cxxtools-2.2.patch/configure
---- cxxtools-2.2/configure	2013-04-21 21:13:11.000000000 +0200
-+++ cxxtools-2.2.patch/configure	2014-01-03 20:34:53.404660480 +0100
-@@ -17316,8 +17316,8 @@
- 
- 
- 
--CXXTOOLS_CXXFLAGS='-I${includedir}'
--CXXTOOLS_LDFLAGS='-L${libdir} -lcxxtools'
-+CXXTOOLS_CXXFLAGS=''
-+CXXTOOLS_LDFLAGS='-lcxxtools'
- 
- 
- 
-diff -Naur cxxtools-2.2/configure.in cxxtools-2.2.patch/configure.in
---- cxxtools-2.2/configure.in	2013-04-20 23:31:50.000000000 +0200
-+++ cxxtools-2.2.patch/configure.in	2014-01-03 20:26:32.064005192 +0100
-@@ -106,8 +106,8 @@
- 
- AC_PROG_LIBTOOL
- 
--CXXTOOLS_CXXFLAGS='-I${includedir}'
--CXXTOOLS_LDFLAGS='-L${libdir} -lcxxtools'
-+CXXTOOLS_CXXFLAGS=''
-+CXXTOOLS_LDFLAGS='-lcxxtools'
- 
- AC_SUBST(CXXTOOLS_CXXFLAGS)
- AC_SUBST(CXXTOOLS_LDFLAGS)

packages/3rdparty/lib/libdvbcsa/build

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. config/options $1
+
+cd $PKG_BUILD
+
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --disable-shared \
+            --enable-static \
+            --with-sysroot=$SYSROOT_PREFIX \
+
+$MAKEINSTALL

packages/3rdparty/lib/libdvbcsa/meta

@@ -0,0 +1,37 @@
+################################################################################
+#      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="libdvbcsa"
+PKG_VERSION="1.1.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="LGPL"
+PKG_SITE="http://www.videolan.org/developers/libdvbcsa.html"
+PKG_URL="http://download.videolan.org/pub/videolan/libdvbcsa/${PKG_VERSION}/libdvbcsa-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="lib"
+PKG_SHORTDESC="libdvbcsa is a free implementation of the DVB Common Scrambling Algorithm - DVB/CSA - with encryption and decryption capabilities"
+PKG_LONGDESC="libdvbcsa is a free implementation of the DVB Common Scrambling Algorithm - DVB/CSA - with encryption and decryption capabilities"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

packages/3rdparty/lib/libhdhomerun/build

@@ -0,0 +1,27 @@
+#!/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
+
+cd $PKG_BUILD
+
+make CROSS_COMPILE=$TARGET_PREFIX

packages/3rdparty/lib/libhdhomerun/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="libhdhomerun"
+PKG_VERSION="20130328"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="LGPL"
+PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
+PKG_URL="http://download.silicondust.com/hdhomerun/${PKG_NAME}_${PKG_VERSION}.tgz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="driver"
+PKG_SHORTDESC="The library provides functionality to setup the HDHomeRun, change channels, setup PID filtering, get signal quality and so on."
+PKG_LONGDESC="The library provides functionality to setup the HDHomeRun, change channels, setup PID filtering, get signal quality and so on."
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"

packages/3rdparty/lib/libhdhomerun/rename

@@ -0,0 +1,26 @@
+#!/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
+
+cd $BUILD
+mv ${PKG_NAME} ${PKG_NAME}_${PKG_VERSION}

packages/3rdparty/lib/libxslt/build

@@ -0,0 +1,44 @@
+#!/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
+
+cd $PKG_BUILD
+
+./configure --host=$TARGET_NAME \
+             --build=$HOST_NAME \
+             --prefix=/usr \
+             --sysconfdir=/etc \
+             --enable-static \
+             --disable-shared \
+             --disable-ipv6 \
+             --without-python \
+             --without-crypto
+
+make
+
+$MAKEINSTALL
+
+$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \
+  $SYSROOT_PREFIX/usr/bin/xslt-config
+
+mv $SYSROOT_PREFIX/usr/bin/xslt-config $ROOT/$TOOLCHAIN/bin

packages/3rdparty/lib/libxslt/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      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="libxslt"
+PKG_VERSION="1.1.27"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="MIT"
+PKG_SITE="http://xmlsoft.org/xslt/"
+PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="textproc"
+PKG_SHORTDESC="libxslt"
+PKG_LONGDESC="libxslt"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

packages/3rdparty/lib/libzip/build

@@ -0,0 +1,34 @@
+#!/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
+
+cd $PKG_BUILD
+
+./configure \
+       --host=$TARGET_NAME \
+       --build=$HOST_NAME \
+       --enable-static \
+       --disable-shared \
+       --prefix=/usr 
+
+$MAKEINSTALL

packages/3rdparty/lib/libzip/meta

@@ -0,0 +1,34 @@
+################################################################################
+#      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="libzip"
+PKG_VERSION="0.10.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.nih.at/libzip/"
+PKG_URL="http://www.nih.at/libzip/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SHORTDESC="libzip"
+PKG_LONGDESC="libzip"
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"

packages/3rdparty/lib/libzip/package.mk

@@ -1,39 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC 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.
-#
-#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-PKG_NAME="libzip"
-PKG_VERSION="0.11.2"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.nih.at/libzip/"
-PKG_URL="http://www.nih.at/libzip/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_PRIORITY="optional"
-PKG_SHORTDESC="libzip"
-PKG_LONGDESC="libzip"
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
-
-PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"
-
-post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
-  rm -rf $INSTALL/usr/lib
-}

packages/3rdparty/multimedia/rotorng/build

@@ -0,0 +1,33 @@
+#!/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]*`
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+cd $PKG_BUILD
+
+make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

packages/3rdparty/multimedia/rotorng/meta

@@ -0,0 +1,37 @@
+################################################################################
+#      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="rotorng"
+PKG_VERSION="0.3.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://projects.vdr-developer.org/projects/plg-rotor-ng"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_URL="http://projects.vdr-developer.org/attachments/download/1088/rotorng-${PKG_VERSION}.tar.gz"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="Next generation of a VDR plugin design to drive a diseqc rotor"
+PKG_LONGDESC="Next generation of a VDR plugin design to drive a diseqc rotor"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/rotorng/patches/rotorng-makefile.patch

@@ -0,0 +1,32 @@
+diff --git a/Makefile b/Makefile
+index 9d62d04..5519a07 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,6 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
+ 
+ ### The C++ compiler and options:
+ 
+-CXX      ?= g++
+ CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Wno-parentheses -fpermissive
+ 
+ ### Make sure that the necessary options are included
+@@ -27,7 +26,6 @@ CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Wno-parentheses -fpermissive
+ ### The directory environment:
+ 
+ DVBDIR = ../../../../DVB
+-VDRDIR = ../../..
+ LIBDIR = ../../lib
+ TMPDIR = /tmp
+ 
+@@ -37,11 +35,7 @@ TMPDIR = /tmp
+ 
+ ### The version number of VDR (taken from VDR's "config.h"):
+ 
+-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+-ifeq ($(strip $(APIVERSION)),)
+-  APIVERSION = $(VDRVERSION)
+-endif
+ 
+ ### The name of the distribution archive:
+ 

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

@@ -0,0 +1,33 @@
+#!/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
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+VDR_DIR=`basename $BUILD/vdr-[0-9]*`
+
+cd $PKG_BUILD
+  PWD=`pwd`
+  make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

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

@@ -0,0 +1,37 @@
+################################################################################
+#      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-control"
+PKG_VERSION="0.0.2a"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://ricomp.de/vdr/"
+PKG_URL="http://ricomp.de/vdr/${PKG_NAME}-${PKG_VERSION}.tgz"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr control plugin"
+PKG_LONGDESC="vdr control plugin"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-control/rename

@@ -0,0 +1,26 @@
+#!/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
+
+cd $BUILD
+mv control-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION}

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

@@ -0,0 +1,33 @@
+#!/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]*`
+
+CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+
+cd $PKG_BUILD
+  PWD=`pwd`
+  make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

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

@@ -0,0 +1,37 @@
+################################################################################
+#      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-epgsearch"
+PKG_VERSION="e2de927"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://winni.vdr-developer.org/epgsearch/"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr-epgsearch"
+PKG_LONGDESC="vdr-epgsearch"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

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

@@ -0,0 +1,32 @@
+#!/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]*`
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+cd $PKG_BUILD
+make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

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

@@ -0,0 +1,37 @@
+################################################################################
+#      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-iptv"
+PKG_VERSION="2.0.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/"
+PKG_URL="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr curl"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr-iptv: an IPTV plugin for the Video Disk Recorder (VDR)"
+PKG_LONGDESC="vdr-iptv is an IPTV plugin for the Video Disk Recorder (VDR)"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-01_makefile.patch

@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 48c8b2c..d370f92 100644
+index 7f147b8..db294fc 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -12,8 +12,6 @@
@@ -11,16 +11,15 @@ index 48c8b2c..d370f92 100644
  # The official name of this plugin.
  # This name will be used in the '-P...' option of VDR to load the plugin.
  # By default the main source file also carries this name.
-@@ -27,24 +25,15 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
+@@ -27,23 +25,15 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
  
  ### The directory environment:
  
 -# Use package data if installed...otherwise assume we're under the VDR source directory:
--PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 -LIBDIR = $(call PKGCFG,libdir)
 -LOCDIR = $(call PKGCFG,locdir)
 -PLGCFG = $(call PKGCFG,plgcfg)
--RESDIR = $(call PKGCFG,resdir)
 -CFGDIR = $(call PKGCFG,configdir)
 -#
  TMPDIR ?= /tmp
@@ -38,7 +37,7 @@ index 48c8b2c..d370f92 100644
  
  ### Allow user defined options to overwrite defaults:
  
-@@ -65,7 +54,7 @@ LIBS = $(shell curl-config --libs)
+@@ -64,7 +54,7 @@ LIBS = $(shell curl-config --libs)
  
  ### Includes and Defines (add further entries here):
  
@@ -47,7 +46,7 @@ index 48c8b2c..d370f92 100644
  
  DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
  
-@@ -139,6 +128,7 @@ install-i18n: $(I18Nmsgs)
+@@ -138,6 +128,7 @@ install-i18n: $(I18Nmsgs)
  
  $(SOFILE): $(OBJS)
  	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@

packages/3rdparty/multimedia/vdr-iptv/rename

@@ -0,0 +1,26 @@
+#!/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
+
+cd $BUILD
+mv iptv-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION}

packages/3rdparty/multimedia/vdr-live/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]*`
+
+CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+
+# dont build parallel
+  MAKEFLAGS=-j1
+
+cd $PKG_BUILD
+  PWD=`pwd`
+  make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

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

@@ -0,0 +1,37 @@
+################################################################################
+#      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-live"
+PKG_VERSION="0.3.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://live.vdr-developer.org/en/index.php"
+PKG_URL="http://live.vdr-developer.org/downloads/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr tntnet pcre-host pcre"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr-live: the LIVE Interactive VDR Environment/"
+PKG_LONGDESC="vdr-live allows a comfortable operation of VDR and some of its plugins trough a web interface"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-04_tntnet-2.0.patch

@@ -0,0 +1,12 @@
+Index: vdr-plugin-live-0.2.0/thread.cpp
+===================================================================
+--- vdr-plugin-live-0.2.0.orig/thread.cpp	2011-08-25 21:58:33.000000000 +0200
++++ vdr-plugin-live-0.2.0/thread.cpp	2011-08-25 21:58:37.000000000 +0200
+@@ -3,6 +3,7 @@
+ #include <stdexcept>
+ #include <vdr/tools.h>
+ #include <tnt/tntnet.h>
++#include <tnt/tntconfig.h>
+ #include "thread.h"
+ #include "tntconfig.h"
+ 

packages/3rdparty/multimedia/vdr-live/rename

@@ -0,0 +1,26 @@
+#!/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
+
+cd $BUILD
+mv live-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION}

packages/3rdparty/multimedia/vdr-plugin-dvbapi/build

@@ -0,0 +1,41 @@
+#!/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]*`
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+# dont build parallel
+  MAKEFLAGS=-j1
+
+cd $PKG_BUILD
+  make VDRDIR="../$VDR_DIR" \
+       VDRSRC="../$VDR_DIR" \
+       LIBDIR="." \
+       LOCALEDIR="./locale" \
+       LIBDVBCSA=1 \
+       CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
+

packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta

@@ -0,0 +1,37 @@
+################################################################################
+#      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-plugin-dvbapi"
+PKG_VERSION="555272d"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="vdr openssl"
+PKG_BUILD_DEPENDS="toolchain vdr openssl libdvbcsa"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="TV"
+PKG_LONGDESC="TV"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_makefile.patch

@@ -0,0 +1,77 @@
+diff --git a/Makefile b/Makefile
+index ebe9d76..ef2d2e5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,18 +15,11 @@ VERSION = $(shell grep 'static const char \*VERSION *=' DVBAPI.h | awk '{ print
+ 
+ ### The directory environment:
+ 
+-# Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG  = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR  = $(call PKGCFG,libdir)
+-LOCDIR  = $(call PKGCFG,locdir)
+-PLGCFG  = $(call PKGCFG,plgcfg)
+-#
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++include $(VDRDIR)/Make.global
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+@@ -34,33 +27,7 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
+-ifeq ($(strip $(APIVERSION)),)
+-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+-NOCONFIG := 1
+-endif
+-
+-# backward compatibility with VDR version < 1.7.34
+-API1733 := $(shell if [ "$(APIVERSION)" \< "1.7.34" ]; then echo true; fi; )
+-
+-ifdef API1733
+-
+-VDRSRC = $(VDRDIR)
+-ifeq ($(strip $(VDRSRC)),)
+-VDRSRC := ../../..
+-endif
+-LIBDIR = $(VDRSRC)/PLUGINS/lib
+-
+-ifndef NOCONFIG
+-CXXFLAGS = $(call PKGCFG,cflags)
+-CXXFLAGS += -fPIC
+-else
+--include $(VDRSRC)/Make.global
+--include $(VDRSRC)/Make.config
+-endif
+-
+-export CXXFLAGS
+-endif
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### The name of the distribution archive:
+ 
+@@ -73,9 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-ifdef API1733
+ INCLUDES += -I$(VDRSRC)/include
+-endif
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+@@ -145,6 +110,7 @@ $(DEPFILE): Makefile
+ 
+ $(SOFILE): $(OBJS) $(FFDECSA)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(DECSALIB) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ libdvbapi-dvbsddevice.so: device-sd.o
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $< -o $@

packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-04_force-softcsa.patch

@@ -0,0 +1,13 @@
+diff --git a/device-tmpl.cpp b/device-tmpl.cpp
+index 158324b..4d9f862 100644
+--- a/device-tmpl.cpp
++++ b/device-tmpl.cpp
+@@ -71,7 +71,7 @@ SCDEVICE::SCDEVICE(cScDevicePlugin *DevPlugin, int Adapter, int Frontend, int ca
+   fd_dvr = -1;
+ 
+   int n = Adapter;
+-  softcsa = (fd_ca < 0);
++  softcsa = true;
+   if (softcsa)
+   {
+     if (HasDecoder())

packages/3rdparty/multimedia/vdr-plugin-streamdev/build

@@ -0,0 +1,33 @@
+#!/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]*`
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+cd $PKG_BUILD
+  PWD=`pwd`
+  make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

packages/3rdparty/multimedia/vdr-plugin-streamdev/meta

@@ -0,0 +1,37 @@
+################################################################################
+#      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-plugin-streamdev"
+PKG_VERSION="329129d"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://projects.vdr-developer.org/projects/show/plg-streamdev"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="vdr openssl"
+PKG_BUILD_DEPENDS="toolchain vdr openssl"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="TV"
+PKG_LONGDESC="TV"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/build

@@ -0,0 +1,33 @@
+#!/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]*`
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+cd $PKG_BUILD
+  make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
+

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/meta

@@ -0,0 +1,37 @@
+################################################################################
+#      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-plugin-vnsiserver"
+PKG_VERSION="e3cd383"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/opdenkamp/xbmc-pvr-addons/tree/master/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="TV"
+PKG_LONGDESC="TV"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/patches/vdr-plugin-vnsiserver-02_makefile-largefile.patch

@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 92fc90d..4196724 100644
+--- a/Makefile
++++ b/Makefile
+@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE)
+ 
+ INCLUDES += -I$(VDRDIR)/include -I$(VDRDIR)
+ 
+-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVNSI_SERVER_VERSION='"$(VERSION)"'
++DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVNSI_SERVER_VERSION='"$(VERSION)"' -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ 
+ ifeq ($(DEBUG),1)
+ DEFINES += -DDEBUG

packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/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]*`
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+cd $PKG_BUILD
+  PWD=`pwd`
+  make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
+  cd dist/epgdata2xmltv
+  make -j1
+

packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta

@@ -0,0 +1,37 @@
+################################################################################
+#      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-plugin-xmltv2vdr"
+PKG_VERSION="30903cc0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr"
+PKG_URL="http://projects.vdr-developer.org/git/vdr-plugin-xmltv2vdr.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS="vdr curl libxml2"
+PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml2 libxslt enca pcre"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr-xmltv2vdr"
+PKG_LONGDESC="vdr-xmltv2vdr"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-plugin-xvdr/build

@@ -0,0 +1,29 @@
+#!/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]*`
+
+cd $PKG_BUILD
+  make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
+

packages/3rdparty/multimedia/vdr-plugin-xvdr/meta

@@ -0,0 +1,37 @@
+################################################################################
+#      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-plugin-xvdr"
+PKG_VERSION="33afe59"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/pipelka/vdr-plugin-xvdr"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="TV"
+PKG_LONGDESC="TV"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-makefile.patch

@@ -0,0 +1,79 @@
+diff --git a/Makefile b/Makefile
+index 06a49a2..ab037bd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,45 +16,46 @@ VERSION = $(shell grep 'static const char \*VERSION *=' src/xvdr/xvdr.h | awk '{
+ ### The directory environment:
+ 
+ # Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR = $(call PKGCFG,libdir)
+-LOCDIR = $(call PKGCFG,locdir)
+-PLGCFG = $(call PKGCFG,plgcfg)
+-CFGDIR  = $(call PKGCFG,configdir)/plugins/$(PLUGIN)
+ #
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++OPTLEVEL ?= 2
++CXXFLAGS = -O$(OPTLEVEL) -g -Wall -Woverloaded-virtual -fPIC -DPIC
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++#DVBDIR = ../../../../DVB
++#VDRDIR = ../../..
++#LIBDIR = ../../lib
++#TMPDIR = /tmp
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+--include $(PLGCFG)
++-include $(VDRDIR)/Make.config
++-include $(VDRDIR)/Make.global
+ 
+ ### The name of the distribution archive:
+ 
+ ARCHIVE = $(PLUGIN)-$(VERSION)
+ PACKAGE = vdr-$(ARCHIVE)
+ 
++APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
++
+ ### The name of the shared object file:
+ 
+ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES += -I./src
++INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(VDRDIR) -I./src -I.
+ 
+ ifdef DEBUG
+ INCLUDES += -DDEBUG
+ endif
+ 
+-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DXVDR_VERSION='"$(VERSION)"'
++DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DXVDR_VERSION='"$(VERSION)"'
+ 
+ ### The object files (add further files here):
+ 
+@@ -103,7 +104,7 @@ all: $(SOFILE) i18n
+ MAKEDEP = $(CXX) -MM -MG
+ DEPFILE = .dependencies
+ $(DEPFILE): Makefile
+-	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
++	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+ 
+ -include $(DEPFILE)
+ 
+@@ -137,6 +138,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

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

@@ -0,0 +1,42 @@
+#!/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]*`
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+# vdr-sc fails building with LTO support
+  strip_lto
+
+# dont build parallel
+  MAKEFLAGS=-j1
+
+cd $PKG_BUILD
+  make VDRDIR="../$VDR_DIR" \
+       LIBDIR="." \
+       LOCALEDIR="./locale" \
+       CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
+

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

@@ -0,0 +1,37 @@
+################################################################################
+#      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-sc"
+PKG_VERSION="620"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://85.17.209.13:6100/"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="vdr openssl"
+PKG_BUILD_DEPENDS="toolchain vdr openssl"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="TV"
+PKG_LONGDESC="TV"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-620-crosscompiling.patch

@@ -0,0 +1,12 @@
+diff -Naur vdr-sc-603/Makefile vdr-sc-603.patch/Makefile
+--- vdr-sc-603/Makefile	2011-12-24 04:02:53.000000000 +0100
++++ vdr-sc-603.patch/Makefile	2011-12-29 18:57:21.660586103 +0100
+@@ -213,7 +213,7 @@
+ 	@cp -p $< $@
+ 
+ $(FFDECSA) $(FFDECSATEST): $(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
+ 
+ $(I18Npot): $(shell grep -rl '\(tr\|trNOOP\)(\".*\")' *.c $(SYSDIR))
+ 	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<noone@nowhere.org>' -o $@ `ls $^`

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

@@ -0,0 +1,33 @@
+#!/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]*`
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+cd $PKG_BUILD
+make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
+

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

@@ -0,0 +1,37 @@
+################################################################################
+#      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-wirbelscan"
+PKG_VERSION="0.0.7"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://wirbel.htpc-forum.de/wirbelscan/index2.html"
+PKG_URL="http://wirbel.htpc-forum.de/wirbelscan/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="TV"
+PKG_LONGDESC="TV"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-wirbelscan/rename

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. config/options $1
+
+cd $BUILD
+mv wirbelscan-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION}

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

@@ -0,0 +1,35 @@
+#!/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]*`
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+cd $PKG_BUILD
+ln -sf ../vdr-wirbelscan-[0-9]*/wirbelscan_services.h
+
+make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
+

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

@@ -0,0 +1,37 @@
+################################################################################
+#      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-wirbelscancontrol"
+PKG_VERSION="0.0.2"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://wirbel.htpc-forum.de/wirbelscancontrol/index2.html"
+PKG_URL="http://wirbel.htpc-forum.de/wirbelscancontrol/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr vdr-wirbelscan"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="TV"
+PKG_LONGDESC="TV"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-wirbelscancontrol/rename

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. config/options $1
+
+cd $BUILD
+mv wirbelscancontrol-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION}

packages/3rdparty/multimedia/vdr/build

@@ -0,0 +1,45 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
+#
+#  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
+
+LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
+
+cd $PKG_BUILD
+
+cat > Make.config <<EOF
+PLUGINLIBDIR = /usr/lib/vdr
+PREFIX = /usr
+VIDEODIR = /storage/videos
+CONFDIR = /storage/.config/vdr
+LOCDIR = /usr/share/locale
+#LIBS += -lz -lexpat -lbz2 -lfontconfig -lfreetype -lxml2
+
+NO_KBD=yes
+VDR_USER=root
+EOF
+
+make vdr
+make include-dir
+make plugins
+make install-plugins DESTDIR=$ROOT/$PKG_BUILD/.install

packages/3rdparty/multimedia/vdr/meta

@@ -0,0 +1,37 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
+#
+#  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"
+PKG_VERSION="2.0.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.tvdr.de"
+PKG_URL="ftp://ftp.tvdr.de/vdr/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="fontconfig freetype"
+PKG_BUILD_DEPENDS="toolchain fontconfig freetype libcap libjpeg-turbo bzip2 ncurses"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr: A powerful DVB TV application"
+PKG_LONGDESC="This project describes how to build your own digital satellite receiver and video disk recorder. It is based mainly on the DVB-S digital satellite receiver card, which used to be available from Fujitsu Siemens and the driver software developed by the LinuxTV project."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr/patches/vdr-02_disable_eitscan.patch

@@ -0,0 +1,12 @@
+diff -Nru vdr-1.7.15-vanilla/eitscan.c vdr-1.7.15-disable_eitscan/eitscan.c
+--- vdr-1.7.15-vanilla/eitscan.c	2010-06-06 19:11:14.000000000 +0300
++++ vdr-1.7.15-disable_eitscan/eitscan.c	2010-06-06 20:44:07.000000000 +0300
+@@ -146,7 +146,7 @@
+                if (Device) {
+                   for (cScanData *ScanData = scanList->First(); ScanData; ScanData = scanList->Next(ScanData)) {
+                       const cChannel *Channel = ScanData->GetChannel();
+-                      if (Channel) {
++                      if (Channel && !cSource::IsType(Channel->Source(), 'I')) {
+                          if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) {
+                             if (Device->ProvidesTransponder(Channel)) {
+                                if (!Device->Receiving()) {

packages/3rdparty/multimedia/vdr/patches/vdr-44_rotor.patch

@@ -0,0 +1,133 @@
+Description: This patch is needed for the rotor plugin.
+Author: Thomas Bergwinkl <Bergwinkl.Thomas@vr-web.de>
+Origin: extracted from the rotor plugin 0.1.4-vdr1.5
+
+Index: b/device.h
+===================================================================
+--- a/device.h
++++ b/device.h
+@@ -24,6 +24,8 @@
+ #include "spu.h"
+ #include "thread.h"
+ #include "tools.h"
++#include <asm/types.h>
++#include <linux/dvb/frontend.h>
+ 
+ #define MAXDEVICES         16 // the maximum number of devices in the system
+ #define MAXPIDHANDLES      64 // the maximum number of different PIDs per device
+@@ -337,6 +339,7 @@
+   virtual bool HasProgramme(void) const;
+          ///< Returns true if the device is currently showing any programme to
+          ///< the user, either through replaying or live.
++  virtual bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd) {return false;}
+ 
+ // PID handle facilities
+ 
+Index: b/dvbdevice.c
+===================================================================
+--- a/dvbdevice.c
++++ b/dvbdevice.c
+@@ -283,6 +283,7 @@
+ private:
+   static cMutex bondMutex;
+   enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
++  bool SendDiseqc;
+   int frontendType;
+   const cDvbDevice *device;
+   int fd_frontend;
+@@ -299,6 +300,7 @@
+   cMutex mutex;
+   cCondVar locked;
+   cCondVar newSet;
++  dvb_diseqc_master_cmd diseqc_cmd;
+   cDvbTuner *bondedTuner;
+   bool bondedMaster;
+   bool SetFrontendType(const cChannel *Channel);
+@@ -325,12 +327,16 @@
+   bool Locked(int TimeoutMs = 0);
+   int GetSignalStrength(void) const;
+   int GetSignalQuality(void) const;
++  bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd);
++private:
++  int GetCurrentDeliverySystem(void);
+   };
+ 
+ cMutex cDvbTuner::bondMutex;
+ 
+ cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend)
+ {
++  SendDiseqc = false;
+   frontendType = SYS_UNDEFINED;
+   device = Device;
+   fd_frontend = Fd_Frontend;
+@@ -653,6 +659,35 @@
+   return -1;
+ }
+ 
++int cDvbTuner::GetCurrentDeliverySystem()
++{
++  dtv_property Frontend[1];
++  memset(&Frontend, 0, sizeof(Frontend));
++  dtv_properties CmdSeq;
++  memset(&CmdSeq, 0, sizeof(CmdSeq));
++  CmdSeq.props = Frontend;
++  Frontend[0].cmd = DTV_DELIVERY_SYSTEM;
++  Frontend[0].u.data = 0;
++  if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) < 0) {
++     esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
++     return SYS_UNDEFINED;
++     }
++  return Frontend[0].u.data;
++}
++
++bool cDvbTuner::SendDiseqcCmd(dvb_diseqc_master_cmd cmd)
++{
++  cMutexLock MutexLock(&mutex);
++  int frontendType = GetCurrentDeliverySystem();
++  if ((frontendType != SYS_DVBS && frontendType != SYS_DVBS2) || SendDiseqc)
++    return false;
++  diseqc_cmd=cmd;
++  SendDiseqc=true;
++  newSet.Broadcast();
++  return true;
++}
++
++
+ static unsigned int FrequencyToHz(unsigned int f)
+ {
+   while (f && f < 1000000)
+@@ -874,6 +909,10 @@
+         if (GetFrontendStatus(NewStatus))
+            Status = NewStatus;
+         cMutexLock MutexLock(&mutex);
++        if (SendDiseqc) {
++           CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &diseqc_cmd));
++           SendDiseqc=false;
++           }
+         int WaitTime = 1000;
+         switch (tunerStatus) {
+           case tsIdle:
+@@ -1571,6 +1610,11 @@
+   return dvbTuner ? dvbTuner->Locked(TimeoutMs) : false;
+ }
+ 
++bool cDvbDevice::SendDiseqcCmd(dvb_diseqc_master_cmd cmd)
++{
++  return dvbTuner->SendDiseqcCmd(cmd);
++}
++
+ void cDvbDevice::SetTransferModeForDolbyDigital(int Mode)
+ {
+   setTransferModeForDolbyDigital = Mode;
+Index: b/dvbdevice.h
+===================================================================
+--- a/dvbdevice.h
++++ b/dvbdevice.h
+@@ -196,6 +196,7 @@
+   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
+ public:
+   virtual bool HasLock(int TimeoutMs = 0) const;
++  virtual bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd);
+ 
+ // PID handle facilities
+