config/version: set version to 5.0.0

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

CONTRIBUTING.md

@@ -35,6 +35,12 @@ 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

README.md

@@ -64,8 +64,6 @@ 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).

config/addon/xbmc.python.module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="@PKG_ADDON_ID@"
-       name="@PKG_NAME@"
+       name="@ADDON_NAME@"
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
@@ -8,9 +8,7 @@
     <import addon="xbmc.python" version="2.1.0"/>
 @REQUIRES@
   </requires>
-  <extension point="@PKG_ADDON_TYPE@"
-             library="default.py">
-        <provides>executable</provides>
+  <extension point="xbmc.python.module" library="lib/">
   </extension>
   <extension point="xbmc.addon.metadata">
     <summary>@PKG_SHORTDESC@</summary>

config/addon/xbmc.python.script.xml

@@ -0,0 +1,24 @@
+<?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

@@ -0,0 +1,24 @@
+<?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/functions

@@ -1,12 +1,9 @@
 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
@@ -31,6 +28,8 @@ setup_toolchain() {
   elif [ "$1" = host ]; then
     export DESTIMAGE="host"
 
+    unset CPP
+
     export AWK=$HOST_AWK
     export CC=$HOST_CC
     export CXX=$HOST_CXX
@@ -56,12 +55,22 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  . $ROOT/packages/linux/package.mk
+  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() {
-  . $ROOT/packages/linux/package.mk
+  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}
 }
 
@@ -73,10 +82,16 @@ get_module_dir() {
 # get package's build dir
 get_build_dir() {
   if [ ! -z $1 ] ; then
-    local _PKG_DIR=$(find $ROOT/packages -name $1)
-    if [ -d $_PKG_DIR -a -f $_PKG_DIR/package.mk ] ; 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
 }
@@ -170,14 +185,13 @@ do_autoreconf() {
 
 strip_lto() {
   # strip out LTO optimization from *FLAGS
-  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"`
+  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
 }
 
 strip_gold() {
@@ -263,6 +277,9 @@ 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"))"
@@ -298,16 +315,16 @@ 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 - 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 - 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"
 
   # Input device configuration
 
@@ -318,7 +335,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 - XBMC Joystick support:\t\t $JOYSTICK_SUPPORT"
+  config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT"
 
   # Misc. hardware configuration
 
@@ -327,7 +344,6 @@ 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"
@@ -340,22 +356,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
 
@@ -385,24 +401,38 @@ 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"
 
-  # XBMC configuration
+  # Kodi configuration
 
-  config_message="$config_message\n\n XBMC configuration:"
+  config_message="$config_message\n\n Kodi configuration:"
   config_message="$config_message\n $dashes$dashes"
 
-  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"
+  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 AFP support:\t\t\t $KODI_AFP_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"
+
 
   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 $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 - 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"
   config_message="$config_message\n $dashes$dashes$dashes"

config/graphic

@@ -21,9 +21,9 @@ if [ "$SDL_SUPPORT" = no ]; then
 fi
 
 if [ "$OPENGL_SUPPORT" = no ]; then
-  XBMC_SCR_RSXS="no"
-  XBMC_VIS_PROJECTM="no"
-  XBMC_VIS_GOOM="no"
+  KODI_SCR_RSXS="no"
+  KODI_VIS_PROJECTM="no"
+  KODI_VIS_GOOM="no"
 fi
 
 get_graphicdrivers() {
@@ -40,14 +40,14 @@ get_graphicdrivers() {
       DRI_DRIVERS="$DRI_DRIVERS,i915"
       XORG_DRIVERS="$XORG_DRIVERS intel"
       COMPOSITE_SUPPORT="yes"
-      LIBVA="$LIBVA libva-intel-driver"
+      VAAPI_SUPPORT="yes"
     fi
 
     if [ "$drv" = "i965" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i965"
       XORG_DRIVERS="$XORG_DRIVERS intel"
       COMPOSITE_SUPPORT="yes"
-      LIBVA="$LIBVA libva-intel-driver"
+      VAAPI_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nouveau" ]; then
@@ -58,15 +58,16 @@ get_graphicdrivers() {
       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"
     fi
 
     if [ "$drv" = "nvidia-legacy" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
+      VDPAU_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r200" ]; then
@@ -80,6 +81,7 @@ get_graphicdrivers() {
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
       COMPOSITE_SUPPORT="yes"
+      VDPAU_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r600" ]; then
@@ -87,6 +89,7 @@ get_graphicdrivers() {
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
       COMPOSITE_SUPPORT="yes"
+      VDPAU_SUPPORT="yes"
     fi
 
     if [ "$drv" = "radeonsi" ]; then
@@ -94,6 +97,7 @@ get_graphicdrivers() {
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
       COMPOSITE_SUPPORT="yes"
+      VDPAU_SUPPORT="yes"
     fi
 
   done

config/optimize

@@ -30,7 +30,7 @@ fi
 TARGET_CPPFLAGS=
 TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $GCC_OPTIM_LTO $PROJECT_CFLAGS"
 TARGET_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO $GCC_OPTIM"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO"
 TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
 TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
 

config/options

@@ -1,6 +1,14 @@
 # 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
@@ -18,23 +26,28 @@ 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`
@@ -52,7 +65,9 @@ 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)
-  CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
+  if test -z "${CONCURRENCY_MAKE_LEVEL}"; then
+    CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
+  fi
 
 # cache size for ccache
 # Set the maximum size of the files stored in the cache. You can specify a
@@ -77,5 +92,10 @@ 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

@@ -64,26 +64,46 @@ SED="sed -i"
   PKG_IS_ADDON="no"
 
   if [ -n "$1" ]; then
-    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" ] ; then
-        FOUND=$((FOUND+1))
-        # found first. set $PKG_DIR
+    _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
         PKG_DIR="$DIR"
-        if [ $FOUND -gt 1 ] ; then
-          # found more ? fail
+        # 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"
+          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
@@ -108,6 +128,8 @@ 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
@@ -125,6 +147,8 @@ 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++

config/version

@@ -1,9 +1,9 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="4.1.1"
+  OPENELEC_VERSION="5.0.0"
 
 # OS_VERSION: OS Version
-  OS_VERSION="4.2"
+  OS_VERSION="5.0"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="4.1"
+  ADDON_VERSION="4.3"
 

distributions/OpenELEC/options

@@ -0,0 +1,239 @@
+# 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 afpfs-ng support (mounting AFP shares with KODI) (yes / no)
+  KODI_AFP_SUPPORT="no"
+
+# 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/multimedia/vdr/patches/vdr-02_disable_eitscan.patch

@@ -1,12 +0,0 @@
-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/addons/driver/hdhomerun/changelog.txt

@@ -1,3 +1,9 @@
+4.3.2
+  allow running scripts from addon settings
+4.3.1
+  rebuild for addon api bump
+4.3.0
+  rebuild for addon api bump
 4.1.2
   clean up
 4.1.0

packages/addons/driver/hdhomerun/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="hdhomerun"
-PKG_VERSION="4.1"
+PKG_VERSION="4.3"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh

@@ -32,8 +32,8 @@ unlock() { flock -u $HDHR_LOCKFD; flock -xn $HDHR_LOCKFD && rm -f "$HDHR_LOCKFIL
 # exclusive lock
 exlock
 
-HDHR_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun"
-HDHR_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.hdhomerun"
+HDHR_ADDON_DIR="$HOME/.kodi/addons/driver.dvb.hdhomerun"
+HDHR_ADDON_HOME="$HOME/.kodi/userdata/addon_data/driver.dvb.hdhomerun"
 HDHR_ADDON_SETTINGS="$HDHR_ADDON_HOME/settings.xml"
 
 # modules are not automatically loaded

packages/addons/driver/hdhomerun/source/default.py

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2013 Stephan Raue (stephan@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
@@ -15,18 +15,3 @@
 #  You should have received a copy of the GNU General Public License
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
-
-import os
-import sys
-import xbmcaddon
-
-__settings__      = xbmcaddon.Addon(id = 'driver.dvb.hdhomerun')
-__cwd__           = __settings__.getAddonInfo('path')
-__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
-__settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
-
-if __name__ == "__main__" and len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
-  sys.path.append(__resources_lib__)
-  from functions import refresh_hdhomerun_tuners
-  refresh_hdhomerun_tuners(__settings_xml__)
-  __settings__.openSettings()

packages/addons/driver/hdhomerun/source/resources/actions.py

@@ -1,4 +1,3 @@
-#!/bin/sh
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
@@ -16,27 +15,18 @@
 #  You should have received a copy of the GNU General Public License
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
-# copy userconfig and samples
 
-. /etc/profile
+import os
+import sys
+import xbmcaddon
 
-if [ -d /usr/config ]; then
-  progress "copy userconfig and samples"
+__settings__      = xbmcaddon.Addon(id = 'driver.dvb.hdhomerun')
+__cwd__           = __settings__.getAddonInfo('path')
+__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
+__settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
 
-    cd /usr/config
-    mkdir -p /storage/.config
-
-    for dir in `find . -type d`; do
-      mkdir -p /storage/.config/$dir
-    done
-
-    for config in `find . -type f -not -name "*.sample"`; do
-      if [ ! -f /storage/.config/$config ]; then
-        cp $config /storage/.config/$config
-      fi
-    done
-
-    for sample in `find . -type f -name "*.sample"`; do
-      cp $sample /storage/.config/$sample
-    done
-fi
+if len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
+  sys.path.append(__resources_lib__)
+  from functions import refresh_hdhomerun_tuners
+  refresh_hdhomerun_tuners(__settings_xml__)
+  __settings__.openSettings()

packages/addons/driver/hdhomerun/source/resources/lib/functions.py

@@ -24,7 +24,7 @@ import shutil
 import xmlpp
 from xml.dom import minidom
 
-__sundtek_userspace__ = '/storage/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv/'
+__sundtek_userspace__ = '/storage/.kodi/userdata/addon_data/driver.dvb.sundtek-mediatv/'
 
 ######################################################################################################
 # backup setting.xml file only if backup doesn't exist

packages/addons/driver/hdhomerun/source/resources/lib/xmlpp.py

@@ -37,36 +37,39 @@ def _usage(this_file):
     return """SYNOPSIS: pretty print an XML document
 USAGE: python %s <filename> \n""" % this_file
 
-def _pprint_line(indent_level, line, width=100, output=_sys.stdout):
+def _pprint_line(indent_level, line, width=100, output=_sys.stdout, ignore_contents = False):
     if line.strip():
         start = ""
         number_chars = 0
         for l in range(indent_level):
             start = start + " "
             number_chars = number_chars + 1
-        try:
-            elem_start = _re.findall("(\<\W{0,1}\w+:\w+) ?", line)[0]
-            elem_finished = _re.findall("([?|\]\]/]*\>)", line)[0] 
-            #should not have *
-            attrs = _re.findall("(\S*?\=\".*?\")", line)
-            output.write(start + elem_start)
-            number_chars = len(start + elem_start)
-            for attr in attrs:
-                if (attrs.index(attr) + 1) == len(attrs):
-                    number_chars = number_chars + len(elem_finished)
-                if (number_chars + len(attr) + 1) > width:
-                    output.write("\n")
-                    for i in range(len(start + elem_start) + 1):
+        if not ignore_contents:
+            try:
+                elem_start = _re.findall("(\<\W{0,1}\w+:\w+) ?", line)[0]
+                elem_finished = _re.findall("([?|\]\]/|\-\-]*\>)", line)[0] 
+                #should not have *
+                attrs = _re.findall("(\S*?\=\".*?\")", line)
+                output.write(start + elem_start)
+                number_chars = len(start + elem_start)
+                for attr in attrs:
+                    if (attrs.index(attr) + 1) == len(attrs):
+                        number_chars = number_chars + len(elem_finished)
+                    if (number_chars + len(attr) + 1) > width:
+                        output.write("\n")
+                        for i in range(len(start + elem_start) + 1):
+                            output.write(" ")
+                        number_chars = len(start + elem_start) + 1 
+                    else:
                         output.write(" ")
-                    number_chars = len(start + elem_start) + 1 
-                else:
-                    output.write(" ")
-                    number_chars = number_chars + 1
-                output.write(attr)
-                number_chars = number_chars + len(attr)
-            output.write(elem_finished + "\n")
-        except IndexError:
-            #give up pretty print this line
+                        number_chars = number_chars + 1
+                    output.write(attr)
+                    number_chars = number_chars + len(attr)
+                output.write(elem_finished + "\n")
+            except IndexError:
+                #give up pretty print this line
+                output.write(start + line + "\n")
+        else:
             output.write(start + line + "\n")
                 
 
@@ -80,7 +83,8 @@ def _get_next_elem(data):
     start_pos = data.find("<")
     end_pos = data.find(">") + 1
     retval = data[start_pos:end_pos]
-    stopper = retval.rfind("/") 
+    stopper = retval.rfind("/")
+    ignore_contents = False
     if stopper < retval.rfind("\""):
         stopper = -1
     single = (stopper > -1 and ((retval.find(">") - stopper) < (stopper - retval.find("<"))))
@@ -89,11 +93,19 @@ def _get_next_elem(data):
     ignore_question =  retval.find("<?") > -1
 
     if ignore_excl:
+        ignore_contents = True
         cdata = retval.find("<![CDATA[") > -1
         if cdata:
             end_pos = data.find("]]>")
             if end_pos > -1:
                 end_pos = end_pos + len("]]>")
+                stopper = end_pos
+        else:
+            end_pos = data.find("-->")
+            if end_pos > -1:
+                end_pos = end_pos + len("-->")
+                stopper = end_pos
+        retval = data[start_pos:end_pos]
 
     elif ignore_question:
         end_pos = data.find("?>") + len("?>")
@@ -101,11 +113,12 @@ def _get_next_elem(data):
     
     no_indent = ignore or single
 
-    #print retval, end_pos, start_pos, stopper > -1, no_indent
+    
     return start_pos, \
            end_pos, \
            stopper > -1, \
-           no_indent
+           no_indent, \
+           ignore_contents
 
 def get_pprint(xml, indent=4, width=80):
     """Returns the pretty printed xml """
@@ -116,6 +129,8 @@ def get_pprint(xml, indent=4, width=80):
             self.output += string
     out = out()
     pprint(xml, output=out, indent=indent, width=width)
+    
+
 
     return out.output
 
@@ -126,7 +141,7 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
     Use indent to select indentation level. Default is 4   """
     data = xml
     indent_level = 0
-    start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
+    start_pos, end_pos, is_stop, no_indent, ignore_contents  = _get_next_elem(data)
     while ((start_pos > -1 and end_pos > -1)):
         _pprint_elem_content(indent_level, data[:start_pos].strip(), 
                              output=output)
@@ -136,7 +151,8 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
         _pprint_line(indent_level, 
                      data[:end_pos - start_pos], 
                      width=width,
-                     output=output)
+                     output=output,
+                     ignore_contents=ignore_contents)
         data = data[end_pos - start_pos:]
         if not is_stop and not no_indent :
             indent_level = indent_level + indent
@@ -144,7 +160,7 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
         if not data:
             break
         else:
-            start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
+            start_pos, end_pos, is_stop, no_indent, ignore_contents  = _get_next_elem(data)
     
 
 if __name__ == "__main__":

packages/addons/driver/hdhomerun/source/resources/settings.xml

@@ -11,6 +11,6 @@
   <category label="9000">
     <setting type="sep" />
     <setting id="ENABLE_TUNER_TYPES" type="bool" label="9005" default="true" />
-    <setting label="9010" option="close" type="action" action="RunScript($ID, refresh_tuners)" />
+    <setting label="9010" option="close" type="action" id="refresh_tuners" action="RunScript($CWD/resources/actions.py, refresh_tuners)" />
   </category>
 </settings>

packages/addons/driver/imon-mce/changelog.txt

@@ -1,11 +1,21 @@
+4.3.1
+ fix keymaps path
+
+4.3.0
+ rebuild for addon api bump
+
 4.1.0
  rebuild for addon api bump
+
 4.0.1
  rebuild
+
 4.0.0
   rebuild for OpenELEC-4.0
+
 3.1.1
   rebuild for OpenELEC-3.2
+
 3.0.1
 - bump addon version
 

packages/addons/driver/imon-mce/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="imon-mce"
-PKG_VERSION="4.1"
-PKG_REV="0"
+PKG_VERSION="4.3"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.openelec.tv"

packages/addons/driver/imon-mce/source/bin/imon-mce.service

@@ -21,4 +21,4 @@
 . /etc/profile
 
 sleep 1 && \
-ir-keytable -p rc6 -w /etc/rc_keymaps/imon_mce &
+ir-keytable -p rc6 -w /usr/lib/udev/rc_keymaps/imon_mce &

packages/addons/driver/sundtek-mediatv/changelog.txt

@@ -1,3 +1,15 @@
+4.3.4
+  fixed xbmc/kodi rebranding error
+  some fixes
+4.3.3
+  addon transformed to service addon
+  new addon settings option to enable to check for new driver at boot
+4.3.2
+  new addon settings option to enable to update driver from web with latest version
+4.3.1
+  update driver
+4.3.0
+  rebuild for addon api bump
 4.1.5
   dont touch /storage/.profile
 4.1.4

packages/addons/driver/sundtek-mediatv/package.mk

@@ -17,19 +17,19 @@
 ################################################################################
 
 PKG_NAME="sundtek-mediatv"
-PKG_VERSION="4.1"
-PKG_REV="5"
+PKG_VERSION="4.3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET=""
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="Sundtek USB Stick DVB userspace driver"
 PKG_LONGDESC="Driver for Sundtek MediaTV Pro (DVB-C, DVB-T, AnalogTV, Composite, S-Video, FM-Radio USB Stick) and Sundtek SkyTV Ultimate (DVB-S/S2 USB)."
 PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.python.script"
+PKG_ADDON_TYPE="xbmc.service"
 PKG_AUTORECONF="no"
 
 make_target() {
@@ -47,11 +47,18 @@ make_target() {
       INSTALLER_URL="http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz"
       ;;
   esac
+  
   wget -O installer.tar.gz $INSTALLER_URL
+  
   tar -xzf installer.tar.gz
-  # we run this via wrapper
-  mv opt/bin/mediaclient opt/bin/mediaclient.bin
-  chmod 755 opt/bin/*
+  
+  chmod -R 755 opt/ etc/
+  
+  rm -f  opt/bin/getinput.sh
+  rm -f  opt/bin/lirc.sh
+  rm -fr opt/lib/pm/
+
+  wget -O version.used http://sundtek.de/media/latest.phtml
 }
 
 makeinstall_target() {
@@ -64,4 +71,5 @@ addon() {
   cp -P $PKG_DIR/settings-default.xml $ADDON_BUILD/$PKG_ADDON_ID/
   cp -Pa $PKG_BUILD/opt/bin $ADDON_BUILD/$PKG_ADDON_ID/
   cp -Pa $PKG_BUILD/opt/lib $ADDON_BUILD/$PKG_ADDON_ID/
+  cp $PKG_BUILD/version.used $ADDON_BUILD/$PKG_ADDON_ID/
 }

packages/addons/driver/sundtek-mediatv/settings-default.xml

@@ -17,4 +17,5 @@
   <setting id="DEVICE4_NUM" value="1" />
   <setting id="DEVICE5_IP"  value="" />
   <setting id="DEVICE5_NUM" value="1" />
+  <setting id="CHECK_BOOT" value="false" />
 </settings>

packages/addons/driver/sundtek-mediatv/source/bin/mediaclient

@@ -1,2 +0,0 @@
-#!/bin/sh
-LD_PRELOAD=/storage/.xbmc/addons/driver.dvb.sundtek-mediatv/lib/libmediaclient.so exec mediaclient.bin "$@"

packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.start

@@ -0,0 +1,247 @@
+#!/bin/sh
+
+################################################################################
+#      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/>.
+################################################################################
+
+. /etc/profile
+
+net_tuner_num_fix() {
+  local num=$1
+
+  [ -z "$num" ] && num=1
+  num=$(( $num *1 ))
+  [ $num -lt 1 ] && num=1
+  num=$(( $num -1 ))
+  echo $num
+}
+
+SUNDTEK_ADDON_DIR="$HOME/.kodi/addons/driver.dvb.sundtek-mediatv"
+SUNDTEK_ADDON_HOME="$HOME/.kodi/userdata/addon_data/driver.dvb.sundtek-mediatv"
+SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml"
+
+mkdir -p $SUNDTEK_ADDON_HOME
+
+if [ ! -f "$SUNDTEK_ADDON_HOME/sundtek.conf" ]; then
+  cp $SUNDTEK_ADDON_DIR/config/* $SUNDTEK_ADDON_HOME/
+else
+  # in case of missing entries in addon home's sundtek.conf
+  entry_set="$(grep use_hwpidfilter $SUNDTEK_ADDON_HOME/sundtek.conf 2>/dev/null)"
+  if [ -z "$entry_set" ]; then
+    sed -i 's|^device_attach=.*|# device_attach not used anymore\n\n# enable HW PID filter\nuse_hwpidfilter=off\n\n# enable listening on network\nenablenetwork=off|g' $SUNDTEK_ADDON_HOME/sundtek.conf
+    sed -i 's|^#first_adapter=.*|first_adapter=0|g' $SUNDTEK_ADDON_HOME/sundtek.conf
+
+    sed -i 's|.*network tuner IP address (OpenELEC specific).*||g' $SUNDTEK_ADDON_HOME/sundtek.conf
+    sed -i 's|.*network_tuner_ip=.*||g' $SUNDTEK_ADDON_HOME/sundtek.conf
+  fi
+fi
+
+if [ ! -f "$SUNDTEK_ADDON_SETTINGS" ]; then
+  cp $SUNDTEK_ADDON_DIR/settings-default.xml $SUNDTEK_ADDON_SETTINGS
+fi
+
+[ ! -f $SUNDTEK_ADDON_HOME/rc_key_enter.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_enter $SUNDTEK_ADDON_HOME/rc_key_enter.map
+[ ! -f $SUNDTEK_ADDON_HOME/rc_key_ok.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_ok $SUNDTEK_ADDON_HOME/rc_key_ok.map
+
+mkdir -p /var/config
+cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
+. /var/config/sundtek-addon.conf
+
+# check if there is new driver on web
+if [ "$CHECK_BOOT" = "true" ]; then
+  if [ ! -f /var/run/sundtek.checked ]; then
+    # only once after boot
+    touch /var/run/sundtek.checked
+
+(
+    # wait some time before checking
+    sleep 20
+    cd $SUNDTEK_ADDON_DIR
+
+    wget -O version.latest http://sundtek.de/media/latest.phtml
+
+    version_used=$(cat version.used)
+    version_latest=$(cat version.latest)
+    if [ "$version_used" != "$version_latest" ]; then
+      # new version exist
+      kodi-send -a "Notification(Sundtek, \"New driver version exist, update manually\", 4000, $SUNDTEK_ADDON_DIR/icon.png)"
+    fi
+)&
+  fi
+fi
+
+if [ -z "$(pidof mediasrv)" ]; then
+  rm -f /var/log/mediasrv.log
+  rm -f /var/log/mediaclient.log
+
+  SUNDTEK_CONF_TMP=/tmp/sundtek.conf
+  cp $SUNDTEK_ADDON_HOME/sundtek.conf $SUNDTEK_CONF_TMP
+
+  [ -z "$LOWEST_ADAPTER_NUM" ] && LOWEST_ADAPTER_NUM=0
+  sed -i "s|^first_adapter=.*|first_adapter=$LOWEST_ADAPTER_NUM|g" $SUNDTEK_CONF_TMP
+
+  # enable HW PID filter
+  if [ "$ENABLE_HW_PID_FILTER" = "true" ]; then
+    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $SUNDTEK_CONF_TMP
+  else
+    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=off|g' $SUNDTEK_CONF_TMP
+  fi
+
+  # enable IR receiver
+  if [ "$ENABLE_IR_RECEIVER" = "true" ]; then
+    sed -i 's|^ir_disabled=.*|ir_disabled=0|g' $SUNDTEK_CONF_TMP
+  else
+    sed -i 's|^ir_disabled=.*|ir_disabled=1|g' $SUNDTEK_CONF_TMP
+  fi
+
+  if [ "$ALLOW_NET_USE" = "true" ]; then
+    sed -i 's|^enablenetwork=.*|enablenetwork=on|g' $SUNDTEK_CONF_TMP
+  else
+    sed -i 's|^enablenetwork=.*|enablenetwork=off|g' $SUNDTEK_CONF_TMP
+  fi
+
+  [ "$DEVICE1_IP" = "0.0.0.0" ] && DEVICE1_IP=""
+  [ "$DEVICE2_IP" = "0.0.0.0" ] && DEVICE2_IP=""
+  [ "$DEVICE3_IP" = "0.0.0.0" ] && DEVICE3_IP=""
+  [ "$DEVICE4_IP" = "0.0.0.0" ] && DEVICE4_IP=""
+  [ "$DEVICE5_IP" = "0.0.0.0" ] && DEVICE5_IP=""
+  DEVICE1_NUM=$(net_tuner_num_fix $DEVICE1_NUM)
+  DEVICE2_NUM=$(net_tuner_num_fix $DEVICE2_NUM)
+  DEVICE3_NUM=$(net_tuner_num_fix $DEVICE3_NUM)
+  DEVICE4_NUM=$(net_tuner_num_fix $DEVICE4_NUM)
+  DEVICE5_NUM=$(net_tuner_num_fix $DEVICE5_NUM)
+
+  if [ "$USE_NET_TUNERS" = "true" -a -n "$DEVICE1_IP" ]; then
+    # delete all network tuner entries
+    awk '/^\[NETWORK\]/{flag=1; next} /^device=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net
+    mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
+    echo "" >>$SUNDTEK_CONF_TMP
+    # remove empty lines at the end of file
+    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
+    # add entries
+    echo -e "\n[NETWORK]" >>$SUNDTEK_CONF_TMP
+    for dev in $(seq 0 $DEVICE1_NUM); do
+      echo "device=$DEVICE1_IP:$dev" >>$SUNDTEK_CONF_TMP
+    done
+    if [ -n "$DEVICE2_IP" ]; then
+      for dev in $(seq 0 $DEVICE2_NUM); do
+        echo "device=$DEVICE2_IP:$dev" >>$SUNDTEK_CONF_TMP
+      done
+      if [ -n "$DEVICE3_IP" ]; then
+        for dev in $(seq 0 $DEVICE3_NUM); do
+          echo "device=$DEVICE3_IP:$dev" >>$SUNDTEK_CONF_TMP
+        done
+        if [ -n "$DEVICE4_IP" ]; then
+          for dev in $(seq 0 $DEVICE4_NUM); do
+            echo "device=$DEVICE4_IP:$dev" >>$SUNDTEK_CONF_TMP
+          done
+          if [ -n "$DEVICE5_IP" ]; then
+            for dev in $(seq 0 $DEVICE5_NUM); do
+              echo "device=$DEVICE5_IP:$dev" >>$SUNDTEK_CONF_TMP
+            done
+          fi
+        fi
+      fi
+    fi
+  else
+    # delete all network tuner entries
+    awk '/^\[NETWORK\]/{flag=1; next} /^device=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net
+    mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
+    echo "" >>$SUNDTEK_CONF_TMP
+    # remove empty lines at the end of file
+    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
+  fi
+
+  if [ "$ENABLE_TUNER_TYPES" = "true" ]; then
+    # get tuner serial numbers
+    SERIALS=$(cat /var/config/sundtek-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_DVBMODE=.*|\1|gp' | sort | uniq)
+    . /var/config/sundtek-addon.conf
+
+    for SERIAL in $SERIALS; do
+      DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL}_DVBMODE)
+      IRPROT=$(eval echo \$ATTACHED_TUNER_${SERIAL}_IRPROT)
+      KEYMAP=$(eval echo \$ATTACHED_TUNER_${SERIAL}_KEYMAP)
+
+      if [ "$DVBMODE" = "DVB-T" ]; then
+        # only set DVB-T because default is DVB-C (and DVB-S is not set either)
+        DVBMODE="DVBT"
+      else
+        DVBMODE=""
+      fi
+
+      [ "$IRPROT" = "NEC" -o "$IRPROT" = "auto" ] && IRPROT=""
+
+      [ ! -f $KEYMAP ] && KEYMAP=""
+
+      # remove setttings for this tuner
+      awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^ir_protocol=|^rcmap=|^initial_dvb_mode=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-types
+      mv ${SUNDTEK_CONF_TMP}-types $SUNDTEK_CONF_TMP
+      echo "" >>$SUNDTEK_CONF_TMP
+      # remove empty lines at the end of file
+      sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
+
+      ADDNEW=true
+      if [ -n "$DVBMODE" ]; then
+        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
+        echo "initial_dvb_mode=$DVBMODE" >>$SUNDTEK_CONF_TMP
+      fi
+      if [ -n "$IRPROT" ]; then
+        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
+        echo "ir_protocol=$IRPROT" >>$SUNDTEK_CONF_TMP
+      fi
+      if [ -n "$KEYMAP" ]; then
+        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
+        echo "rcmap=$KEYMAP" >>$SUNDTEK_CONF_TMP
+      fi
+
+      echo "" >>$SUNDTEK_CONF_TMP
+    done
+  fi
+
+  md5_1=$(md5sum -b $SUNDTEK_CONF_TMP | awk '{print $1}')
+  md5_2=$(md5sum -b $SUNDTEK_ADDON_HOME/sundtek.conf | awk '{print $1}')
+  if [ "$md5_1" != "$md5_2" ]; then
+    # file changed - copy to addon home
+    cp $SUNDTEK_CONF_TMP $SUNDTEK_ADDON_HOME/sundtek.conf
+  fi
+
+  chmod +x $SUNDTEK_ADDON_DIR/bin/*
+  mediasrv --wait-for-devices -p $SUNDTEK_ADDON_DIR/bin -c $SUNDTEK_ADDON_HOME/sundtek.conf -d
+
+  # wait few seconds
+  [ -z "$SETTLE_TIME" ] && SETTLE_TIME=0
+  SETTLE_TIME=$(( $SETTLE_TIME *1 ))
+  if [ $SETTLE_TIME -gt 0 ]; then
+    logger -t Sundtek "### Settle for $SETTLE_TIME sec ###"
+    sleep $SETTLE_TIME
+  fi
+
+  if [ "$RUN_USER_SCRIPT" = "true" -a -f "$SUNDTEK_ADDON_HOME/userscript.sh" ]; then
+    logger -t Sundtek "### Running user script $SUNDTEK_ADDON_HOME/userscript.sh ###"
+    cat $SUNDTEK_ADDON_HOME/userscript.sh | dos2unix >/var/run/sundtek-userscript.sh
+    sh /var/run/sundtek-userscript.sh
+  fi
+
+  # save adapter serial number
+  serial_number_old=$(cat $SUNDTEK_ADDON_HOME/adapters.txt 2>/dev/null)
+  serial_number_new=$(mediaclient -e | awk '/device / {print $0} /SERIAL/ {id=1} /ID:/ {if (id==1) print $2}')
+  if [ "$serial_number_old" != "$serial_number_new" ]; then
+    echo "$serial_number_new" >$SUNDTEK_ADDON_HOME/adapters.txt
+  fi
+fi
+
+logger -t Sundtek "### Sundtek ready ###"

packages/addons/driver/sundtek-mediatv/source/bin/sundtek-mediatv.stop

@@ -1,7 +1,8 @@
+#!/bin/sh
+
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2010-2011 Roman Weber (roman@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
@@ -17,10 +18,9 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-SUBSYSTEM!="block", GOTO="end"
-DEVTYPE!="partition", GOTO="end"
+. /etc/profile
 
-ACTION=="add|change", RUN+="/usr/bin/fsck -M -T -a /dev/%k"
+ADDON_DIR="$HOME/.kodi/addons/driver.dvb.sundtek-mediatv"
 
-# exit
-LABEL="end"
+logger -t Sundtek "### Sundtek driver stop ###"
+mediaclient --shutdown

packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh

@@ -0,0 +1,119 @@
+#!/bin/sh
+
+################################################################################
+#      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/>.
+################################################################################
+
+. /etc/profile
+
+SUNDTEK_ADDON_DIR="$HOME/.kodi/addons/driver.dvb.sundtek-mediatv"
+SUNDTEK_ADDON_HOME="$HOME/.kodi/userdata/addon_data/driver.dvb.sundtek-mediatv"
+SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml"
+
+trap_exit_install() {
+  kodi-send -a "Notification(Sundtek, Something went wrong. Cleaning..., 8000, $SUNDTEK_ADDON_DIR/icon.png)"
+  cd "$SUNDTEK_ADDON_DIR"
+  rm -fr tmp
+  exit 5
+}
+
+# kill process
+systemctl stop driver.dvb.sundtek-mediatv
+killall -9 mediaclient &>/dev/null
+killall -9 mediasrv &>/dev/null
+
+# exit on errors
+set -e
+
+trap trap_exit_install EXIT
+
+cd "$SUNDTEK_ADDON_DIR"
+rm -fr tmp
+mkdir tmp
+cd tmp
+
+logger -t Sundtek "### Starting updating driver ###"
+kodi-send -a "Notification(Sundtek, Starting updating driver, 2000, $SUNDTEK_ADDON_DIR/icon.png)"
+
+wget -O ../version.used http://sundtek.de/media/latest.phtml
+if [ $? -ne 0 ]; then
+  logger -t Sundtek "### Can't get latest version ###"
+  kodi-send -a "Notification(Sundtek, Cant get latest version, 8000, $SUNDTEK_ADDON_DIR/icon.png)"
+  cd ..
+  rm -fr tmp/
+  exit 1
+fi
+
+ARCH=$(sed -n 's|.*\.\([^-]*\)-.*|\1|p' /etc/release | tr -d '\n')
+if [ "$ARCH" = "x86_64" ]; then
+  INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz"
+elif [ "$ARCH" = "i386" ]; then
+  INSTALLER_URL="http://sundtek.de/media/netinst/32bit/installer.tar.gz"
+elif [ "$ARCH" = "arm" ]; then
+  INSTALLER_URL="http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz"
+else
+  logger -t Sundtek "### Unsupported architecture ###"
+  kodi-send -a "Notification(Sundtek, Unsupported architecture, 8000, $SUNDTEK_ADDON_DIR/icon.png)"
+  cd ..
+  rm -fr tmp
+  exit 2
+fi
+
+logger -t Sundtek "### Downloading driver archive for $ARCH ###"
+kodi-send -a "Notification(Sundtek, Downloading driver archive for $ARCH, 2000, $SUNDTEK_ADDON_DIR/icon.png)"
+wget -O installer.tar.gz $INSTALLER_URL
+if [ $? -ne 0 ]; then
+  logger -t Sundtek "### Archive damaged ###"
+  kodi-send -a "Notification(Sundtek, Download failed, 8000, $SUNDTEK_ADDON_DIR/icon.png)"
+  cd ..
+  rm -fr tmp/
+  exit 3
+fi
+
+logger -t Sundtek "### Extracting archive ###"
+kodi-send -a "Notification(Sundtek, Extracting archive, 2000, $SUNDTEK_ADDON_DIR/icon.png)"
+tar -xzf installer.tar.gz
+if [ $? -ne 0 ]; then
+  logger -t Sundtek "### Archive damaged ###"
+  kodi-send -a "Notification(Sundtek, Archive damaged, 8000, $SUNDTEK_ADDON_DIR/icon.png)"
+  cd ..
+  rm -fr tmp/
+  exit 4
+fi
+
+# fix permissions
+chmod -R 755 opt/ etc/
+
+rm -f  opt/bin/getinput.sh
+rm -f  opt/bin/lirc.sh
+rm -fr opt/lib/pm/
+
+cp -Pa opt/bin/* ../bin/
+cp -Pa opt/lib/* ../lib/
+
+cd ..
+rm -fr tmp
+
+logger -t Sundtek "### Driver update finished ###"
+kodi-send -a "Notification(Sundtek, Driver update finished, 5000, $SUNDTEK_ADDON_DIR/icon.png)"
+kodi-send -a "Notification(Sundtek, Please reboot, 5000, $SUNDTEK_ADDON_DIR/icon.png)"
+
+trap - EXIT
+
+systemctl start driver.dvb.sundtek-mediatv
+
+exit 0

packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh

@@ -2,7 +2,7 @@
 
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2013 Stephan Raue (stephan@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
@@ -20,223 +20,11 @@
 
 . /etc/profile
 
-# start locking mechanism - allows only one instance to be run at a time
-SUNDTEK_LOCKFILE="/var/lock/userspace-driver-sundtek.lck"
-SUNDTEK_LOCKFD=99
-# obtain an exclusive lock
-exlock() { eval "exec $SUNDTEK_LOCKFD>\"$SUNDTEK_LOCKFILE\""; flock -x $SUNDTEK_LOCKFD; }
-# drop a lock
-unlock() { flock -u $SUNDTEK_LOCKFD; flock -xn $SUNDTEK_LOCKFD && rm -f "$SUNDTEK_LOCKFILE"; }
-# end locking mechanism
+SUNDTEK_ADDON_DIR="$HOME/.kodi/addons/driver.dvb.sundtek-mediatv"
 
-# exclusive lock
-exlock
-
-net_tuner_num_fix() {
-  local num=$1
-
-  [ -z "$num" ] && num=1
-  num=$(( $num *1 ))
-  [ $num -lt 1 ] && num=1
-  num=$(( $num -1 ))
-  echo $num
-}
-
-SUNDTEK_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
-SUNDTEK_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv"
-SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml"
-
-mkdir -p $SUNDTEK_ADDON_HOME
-
-if [ ! -f "$SUNDTEK_ADDON_HOME/sundtek.conf" ]; then
-  cp $SUNDTEK_ADDON_DIR/config/* $SUNDTEK_ADDON_HOME/
+if [ -f $SUNDTEK_ADDON_DIR/lib/libmediaclient.so ]; then
+  logger -t Sundtek "### Preloading library ###"
+  export LD_PRELOAD=$SUNDTEK_ADDON_DIR/lib/libmediaclient.so
 else
-  # in case of missing entries in addon home's sundtek.conf
-  entry_set="$(grep use_hwpidfilter $SUNDTEK_ADDON_HOME/sundtek.conf 2>/dev/null)"
-  if [ -z "$entry_set" ]; then
-    sed -i 's|^device_attach=.*|# device_attach not used anymore\n\n# enable HW PID filter\nuse_hwpidfilter=off\n\n# enable listening on network\nenablenetwork=off|g' $SUNDTEK_ADDON_HOME/sundtek.conf
-    sed -i 's|^#first_adapter=.*|first_adapter=0|g' $SUNDTEK_ADDON_HOME/sundtek.conf
-
-    sed -i 's|.*network tuner IP address (OpenELEC specific).*||g' $SUNDTEK_ADDON_HOME/sundtek.conf
-    sed -i 's|.*network_tuner_ip=.*||g' $SUNDTEK_ADDON_HOME/sundtek.conf
-  fi
+  logger -t Sundtek "### Preloading library doesn't exist ###"
 fi
-
-if [ ! -f "$SUNDTEK_ADDON_SETTINGS" ]; then
-  cp $SUNDTEK_ADDON_DIR/settings-default.xml $SUNDTEK_ADDON_SETTINGS
-fi
-
-[ ! -f $SUNDTEK_ADDON_HOME/rc_key_enter.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_enter $SUNDTEK_ADDON_HOME/rc_key_enter.map
-[ ! -f $SUNDTEK_ADDON_HOME/rc_key_ok.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_ok $SUNDTEK_ADDON_HOME/rc_key_ok.map
-
-mkdir -p /var/config
-cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
-. /var/config/sundtek-addon.conf
-
-export LD_PRELOAD=$SUNDTEK_ADDON_DIR/lib/libmediaclient.so
-
-if [ -z "$(pidof mediasrv)" ]; then
-  rm -f /var/log/mediasrv.log
-  rm -f /var/log/mediaclient.log
-
-  SUNDTEK_CONF_TMP=/tmp/sundtek.conf
-  cp $SUNDTEK_ADDON_HOME/sundtek.conf $SUNDTEK_CONF_TMP
-
-  [ -z "$LOWEST_ADAPTER_NUM" ] && LOWEST_ADAPTER_NUM=0
-  sed -i "s|^first_adapter=.*|first_adapter=$LOWEST_ADAPTER_NUM|g" $SUNDTEK_CONF_TMP
-
-  # enable HW PID filter
-  if [ "$ENABLE_HW_PID_FILTER" = "true" ]; then
-    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $SUNDTEK_CONF_TMP
-  else
-    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=off|g' $SUNDTEK_CONF_TMP
-  fi
-
-  # enable IR receiver
-  if [ "$ENABLE_IR_RECEIVER" = "true" ]; then
-    sed -i 's|^ir_disabled=.*|ir_disabled=0|g' $SUNDTEK_CONF_TMP
-  else
-    sed -i 's|^ir_disabled=.*|ir_disabled=1|g' $SUNDTEK_CONF_TMP
-  fi
-
-  if [ "$ALLOW_NET_USE" = "true" ]; then
-    sed -i 's|^enablenetwork=.*|enablenetwork=on|g' $SUNDTEK_CONF_TMP
-  else
-    sed -i 's|^enablenetwork=.*|enablenetwork=off|g' $SUNDTEK_CONF_TMP
-  fi
-
-  [ "$DEVICE1_IP" = "0.0.0.0" ] && DEVICE1_IP=""
-  [ "$DEVICE2_IP" = "0.0.0.0" ] && DEVICE2_IP=""
-  [ "$DEVICE3_IP" = "0.0.0.0" ] && DEVICE3_IP=""
-  [ "$DEVICE4_IP" = "0.0.0.0" ] && DEVICE4_IP=""
-  [ "$DEVICE5_IP" = "0.0.0.0" ] && DEVICE5_IP=""
-  DEVICE1_NUM=$(net_tuner_num_fix $DEVICE1_NUM)
-  DEVICE2_NUM=$(net_tuner_num_fix $DEVICE2_NUM)
-  DEVICE3_NUM=$(net_tuner_num_fix $DEVICE3_NUM)
-  DEVICE4_NUM=$(net_tuner_num_fix $DEVICE4_NUM)
-  DEVICE5_NUM=$(net_tuner_num_fix $DEVICE5_NUM)
-
-  if [ "$USE_NET_TUNERS" = "true" -a -n "$DEVICE1_IP" ]; then
-    # delete all network tuner entries
-    awk '/^\[NETWORK\]/{flag=1; next} /^device=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net
-    mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
-    echo "" >>$SUNDTEK_CONF_TMP
-    # remove empty lines at the end of file
-    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
-    # add entries
-    echo -e "\n[NETWORK]" >>$SUNDTEK_CONF_TMP
-    for dev in $(seq 0 $DEVICE1_NUM); do
-      echo "device=$DEVICE1_IP:$dev" >>$SUNDTEK_CONF_TMP
-    done
-    if [ -n "$DEVICE2_IP" ]; then
-      for dev in $(seq 0 $DEVICE2_NUM); do
-        echo "device=$DEVICE2_IP:$dev" >>$SUNDTEK_CONF_TMP
-      done
-      if [ -n "$DEVICE3_IP" ]; then
-        for dev in $(seq 0 $DEVICE3_NUM); do
-          echo "device=$DEVICE3_IP:$dev" >>$SUNDTEK_CONF_TMP
-        done
-        if [ -n "$DEVICE4_IP" ]; then
-          for dev in $(seq 0 $DEVICE4_NUM); do
-            echo "device=$DEVICE4_IP:$dev" >>$SUNDTEK_CONF_TMP
-          done
-          if [ -n "$DEVICE5_IP" ]; then
-            for dev in $(seq 0 $DEVICE5_NUM); do
-              echo "device=$DEVICE5_IP:$dev" >>$SUNDTEK_CONF_TMP
-            done
-          fi
-        fi
-      fi
-    fi
-  else
-    # delete all network tuner entries
-    awk '/^\[NETWORK\]/{flag=1; next} /^device=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net
-    mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
-    echo "" >>$SUNDTEK_CONF_TMP
-    # remove empty lines at the end of file
-    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
-  fi
-
-  if [ "$ENABLE_TUNER_TYPES" = "true" ]; then
-    # get tuner serial numbers
-    SERIALS=$(cat /var/config/sundtek-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_DVBMODE=.*|\1|gp' | sort | uniq)
-    . /var/config/sundtek-addon.conf
-
-    for SERIAL in $SERIALS; do
-      DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL}_DVBMODE)
-      IRPROT=$(eval echo \$ATTACHED_TUNER_${SERIAL}_IRPROT)
-      KEYMAP=$(eval echo \$ATTACHED_TUNER_${SERIAL}_KEYMAP)
-
-      if [ "$DVBMODE" = "DVB-T" ]; then
-        # only set DVB-T because default is DVB-C (and DVB-S is not set either)
-        DVBMODE="DVBT"
-      else
-        DVBMODE=""
-      fi
-
-      [ "$IRPROT" = "NEC" -o "$IRPROT" = "auto" ] && IRPROT=""
-
-      [ ! -f $KEYMAP ] && KEYMAP=""
-
-      # remove setttings for this tuner
-      awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^ir_protocol=|^rcmap=|^initial_dvb_mode=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-types
-      mv ${SUNDTEK_CONF_TMP}-types $SUNDTEK_CONF_TMP
-      echo "" >>$SUNDTEK_CONF_TMP
-      # remove empty lines at the end of file
-      sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
-
-      ADDNEW=true
-      if [ -n "$DVBMODE" ]; then
-        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
-        echo "initial_dvb_mode=$DVBMODE" >>$SUNDTEK_CONF_TMP
-      fi
-      if [ -n "$IRPROT" ]; then
-        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
-        echo "ir_protocol=$IRPROT" >>$SUNDTEK_CONF_TMP
-      fi
-      if [ -n "$KEYMAP" ]; then
-        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
-        echo "rcmap=$KEYMAP" >>$SUNDTEK_CONF_TMP
-      fi
-
-      echo "" >>$SUNDTEK_CONF_TMP
-    done
-  fi
-
-  md5_1=$(md5sum -b $SUNDTEK_CONF_TMP | awk '{print $1}')
-  md5_2=$(md5sum -b $SUNDTEK_ADDON_HOME/sundtek.conf | awk '{print $1}')
-  if [ "$md5_1" != "$md5_2" ]; then
-    # file changed - copy to addon home
-    cp $SUNDTEK_CONF_TMP $SUNDTEK_ADDON_HOME/sundtek.conf
-  fi
-
-  mediasrv --wait-for-devices -p $SUNDTEK_ADDON_DIR/bin -c $SUNDTEK_ADDON_HOME/sundtek.conf -d
-
-  # wait few seconds
-  [ -z "$SETTLE_TIME" ] && SETTLE_TIME=0
-  SETTLE_TIME=$(( $SETTLE_TIME *1 ))
-  if [ $SETTLE_TIME -gt 0 ]; then
-    logger -t Sundtek "### Settle for $SETTLE_TIME sec ###"
-    sleep $SETTLE_TIME
-  fi
-
-  if [ "$RUN_USER_SCRIPT" = "true" -a -f "$SUNDTEK_ADDON_HOME/userscript.sh" ]; then
-    logger -t Sundtek "### Running user script $SUNDTEK_ADDON_HOME/userscript.sh ###"
-    cat $SUNDTEK_ADDON_HOME/userscript.sh | dos2unix >/var/run/sundtek-userscript.sh
-    sh /var/run/sundtek-userscript.sh
-  fi
-(
-  # save adapter serial number in background
-  sleep 5
-  serial_number_old=$(cat $SUNDTEK_ADDON_HOME/adapters.txt 2>/dev/null)
-  serial_number_new=$(mediaclient.bin -e | awk '/device / {print $0} /ID:/ {print $2}')
-  if [ "$serial_number_old" != "$serial_number_new" ]; then
-    echo "$serial_number_new" >$SUNDTEK_ADDON_HOME/adapters.txt
-  fi
-)&
-fi
-
-logger -t Sundtek "### Sundtek ready ###"
-
-# unlock the lock
-unlock

packages/addons/driver/sundtek-mediatv/source/default.py

@@ -15,22 +15,3 @@
 #  You should have received a copy of the GNU General Public License
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
-
-import os
-import sys
-import xbmcaddon
-
-__settings__      = xbmcaddon.Addon(id = 'driver.dvb.sundtek-mediatv')
-__cwd__           = __settings__.getAddonInfo('path')
-__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
-__settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
-
-__mediaclient__   = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'mediaclient.bin'))
-__ld_preload__    = xbmc.translatePath(os.path.join(__cwd__, 'lib', 'libmediaclient.so'))
-__mediaclient_e__ = 'LD_PRELOAD=' + __ld_preload__ + ' ' + __mediaclient__ + ' -e'
-
-if __name__ == "__main__" and len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
-  sys.path.append(__resources_lib__)
-  from functions import refresh_sundtek_tuners
-  refresh_sundtek_tuners(__settings_xml__, __mediaclient_e__)
-  __settings__.openSettings()

packages/addons/driver/sundtek-mediatv/source/resources/actions.py

@@ -0,0 +1,45 @@
+################################################################################
+#      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/>.
+################################################################################
+
+import os
+import sys
+import subprocess
+import xbmcaddon
+
+__settings__      = xbmcaddon.Addon(id = 'driver.dvb.sundtek-mediatv')
+__cwd__           = __settings__.getAddonInfo('path')
+__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
+__settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
+
+__mediaclient__   = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'mediaclient'))
+__mediaclient_e__ = __mediaclient__ + ' -e'
+__update_sh__     = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'sundtek-update-driver.sh'))
+
+if len(sys.argv) == 2:
+  if sys.argv[1] == 'refresh_tuners':
+    print "sundtek refresh tuners"
+    sys.path.append(__resources_lib__)
+    from functions import refresh_sundtek_tuners
+    refresh_sundtek_tuners(__settings_xml__, __mediaclient_e__)
+    __settings__.openSettings()
+  elif sys.argv[1] == 'update_driver':
+    print "sundtek update driver"
+    proc = subprocess.Popen([__update_sh__], shell = True)
+    return_code = proc.wait()
+    print "sundtek update driver return value " + str(return_code)
+    __settings__.openSettings()

packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml

@@ -27,4 +27,8 @@
   <string id="9010">Refresh tuners... (press me)</string>
   <string id="9020">    IR protocol</string>
   <string id="9030">    keymap filename</string>
+
+  <string id="3000">Driver</string>
+  <string id="3020">Check for new driver version at boot</string>
+  <string id="3010">Update from web... (press me)</string>
 </strings>

packages/addons/driver/sundtek-mediatv/source/resources/lib/functions.py

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2013 Stephan Raue (stephan@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
@@ -22,7 +22,7 @@ import shutil
 import xmlpp
 from xml.dom import minidom
 
-__sundtek_userspace__ = '/storage/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv/'
+__sundtek_userspace__ = '/storage/.kodi/userdata/addon_data/driver.dvb.sundtek-mediatv/'
 
 ######################################################################################################
 # backup setting.xml file only if backup doesn't exist

packages/addons/driver/sundtek-mediatv/source/resources/lib/xmlpp.py

@@ -37,36 +37,39 @@ def _usage(this_file):
     return """SYNOPSIS: pretty print an XML document
 USAGE: python %s <filename> \n""" % this_file
 
-def _pprint_line(indent_level, line, width=100, output=_sys.stdout):
+def _pprint_line(indent_level, line, width=100, output=_sys.stdout, ignore_contents = False):
     if line.strip():
         start = ""
         number_chars = 0
         for l in range(indent_level):
             start = start + " "
             number_chars = number_chars + 1
-        try:
-            elem_start = _re.findall("(\<\W{0,1}\w+:\w+) ?", line)[0]
-            elem_finished = _re.findall("([?|\]\]/]*\>)", line)[0] 
-            #should not have *
-            attrs = _re.findall("(\S*?\=\".*?\")", line)
-            output.write(start + elem_start)
-            number_chars = len(start + elem_start)
-            for attr in attrs:
-                if (attrs.index(attr) + 1) == len(attrs):
-                    number_chars = number_chars + len(elem_finished)
-                if (number_chars + len(attr) + 1) > width:
-                    output.write("\n")
-                    for i in range(len(start + elem_start) + 1):
+        if not ignore_contents:
+            try:
+                elem_start = _re.findall("(\<\W{0,1}\w+:\w+) ?", line)[0]
+                elem_finished = _re.findall("([?|\]\]/|\-\-]*\>)", line)[0] 
+                #should not have *
+                attrs = _re.findall("(\S*?\=\".*?\")", line)
+                output.write(start + elem_start)
+                number_chars = len(start + elem_start)
+                for attr in attrs:
+                    if (attrs.index(attr) + 1) == len(attrs):
+                        number_chars = number_chars + len(elem_finished)
+                    if (number_chars + len(attr) + 1) > width:
+                        output.write("\n")
+                        for i in range(len(start + elem_start) + 1):
+                            output.write(" ")
+                        number_chars = len(start + elem_start) + 1 
+                    else:
                         output.write(" ")
-                    number_chars = len(start + elem_start) + 1 
-                else:
-                    output.write(" ")
-                    number_chars = number_chars + 1
-                output.write(attr)
-                number_chars = number_chars + len(attr)
-            output.write(elem_finished + "\n")
-        except IndexError:
-            #give up pretty print this line
+                        number_chars = number_chars + 1
+                    output.write(attr)
+                    number_chars = number_chars + len(attr)
+                output.write(elem_finished + "\n")
+            except IndexError:
+                #give up pretty print this line
+                output.write(start + line + "\n")
+        else:
             output.write(start + line + "\n")
                 
 
@@ -80,7 +83,8 @@ def _get_next_elem(data):
     start_pos = data.find("<")
     end_pos = data.find(">") + 1
     retval = data[start_pos:end_pos]
-    stopper = retval.rfind("/") 
+    stopper = retval.rfind("/")
+    ignore_contents = False
     if stopper < retval.rfind("\""):
         stopper = -1
     single = (stopper > -1 and ((retval.find(">") - stopper) < (stopper - retval.find("<"))))
@@ -89,11 +93,19 @@ def _get_next_elem(data):
     ignore_question =  retval.find("<?") > -1
 
     if ignore_excl:
+        ignore_contents = True
         cdata = retval.find("<![CDATA[") > -1
         if cdata:
             end_pos = data.find("]]>")
             if end_pos > -1:
                 end_pos = end_pos + len("]]>")
+                stopper = end_pos
+        else:
+            end_pos = data.find("-->")
+            if end_pos > -1:
+                end_pos = end_pos + len("-->")
+                stopper = end_pos
+        retval = data[start_pos:end_pos]
 
     elif ignore_question:
         end_pos = data.find("?>") + len("?>")
@@ -101,11 +113,12 @@ def _get_next_elem(data):
     
     no_indent = ignore or single
 
-    #print retval, end_pos, start_pos, stopper > -1, no_indent
+    
     return start_pos, \
            end_pos, \
            stopper > -1, \
-           no_indent
+           no_indent, \
+           ignore_contents
 
 def get_pprint(xml, indent=4, width=80):
     """Returns the pretty printed xml """
@@ -116,6 +129,8 @@ def get_pprint(xml, indent=4, width=80):
             self.output += string
     out = out()
     pprint(xml, output=out, indent=indent, width=width)
+    
+
 
     return out.output
 
@@ -126,7 +141,7 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
     Use indent to select indentation level. Default is 4   """
     data = xml
     indent_level = 0
-    start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
+    start_pos, end_pos, is_stop, no_indent, ignore_contents  = _get_next_elem(data)
     while ((start_pos > -1 and end_pos > -1)):
         _pprint_elem_content(indent_level, data[:start_pos].strip(), 
                              output=output)
@@ -136,7 +151,8 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
         _pprint_line(indent_level, 
                      data[:end_pos - start_pos], 
                      width=width,
-                     output=output)
+                     output=output,
+                     ignore_contents=ignore_contents)
         data = data[end_pos - start_pos:]
         if not is_stop and not no_indent :
             indent_level = indent_level + indent
@@ -144,7 +160,7 @@ def pprint(xml, output=_sys.stdout, indent=4, width=80):
         if not data:
             break
         else:
-            start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
+            start_pos, end_pos, is_stop, no_indent, ignore_contents  = _get_next_elem(data)
     
 
 if __name__ == "__main__":

packages/addons/driver/sundtek-mediatv/source/resources/settings.xml

@@ -27,6 +27,11 @@
   <category label="9000">
     <setting type="sep" />
     <setting id="ENABLE_TUNER_TYPES" type="bool" label="9005" default="true" />
-    <setting label="9010" option="close" type="action" action="RunScript($ID, refresh_tuners)" />
+    <setting label="9010" option="close" type="action" id="refresh_tuners" action="RunScript($CWD/resources/actions.py, refresh_tuners)" />
+  </category>
+  <category label="3000">
+    <setting type="sep" />
+    <setting id="CHECK_BOOT" type="bool" label="3020" default="false" />
+    <setting label="3010" option="close" type="action" id="update_driver" action="RunScript($CWD/resources/actions.py, update_driver)" />
   </category>
 </settings>

packages/addons/driver/sundtek-mediatv/source/sleep.d/99-sundtek-mediatv.power

@@ -25,9 +25,10 @@ oe_setup_addon driver.dvb.sundtek-mediatv
 if [ "$SUSPEND_DRIVER" = "true" ]; then
   case "$1" in
     pre)
-      killall -9 mediasrv &>/dev/null
+      systemctl stop driver.dvb.sundtek-mediatv.service
       ;;
     post)
+    	systemctl start driver.dvb.sundtek-mediatv.service
       ;;
   esac
 fi

packages/addons/driver/sundtek-mediatv/source/system.d/driver.dvb.sundtek-mediatv.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Sundtek driver service
+After=network.target
+
+[Service]
+Type=oneshot
+ExecStart=-/bin/sh -c "exec sh /storage/.kodi/addons/driver.dvb.sundtek-mediatv/bin/sundtek-mediatv.start"
+ExecStop=-/bin/sh -c "exec sh /storage/.kodi/addons/driver.dvb.sundtek-mediatv/bin/sundtek-mediatv.stop"
+RemainAfterExit=yes
+
+[Install]
+WantedBy=kodi.target

packages/addons/repository/repository.unofficial.addon.pro/package.mk

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="repository.unofficial.addon.pro"
-PKG_VERSION="4.1.2"
-PKG_REV="2"
+PKG_VERSION="4.3.3"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://unofficial.addon.pro"
@@ -41,7 +41,8 @@ PKG_MAINTAINER="unofficial.addon.pro"
 make_target() {
   $SED -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
      -e "s|@PROJECT@|$PROJECT|g" \
-     -e "s|@ARCH@|$ARCH|g" \
+     -e "s|@ARCH@|$TARGET_ARCH|g" \
+     -e "s|@PKG_VERSION@|$PKG_VERSION|g" \
   -i addon.xml
 }
 

packages/addons/repository/repository.unofficial.addon.pro/sources/addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="repository.unofficial.addon.pro"
-                name="Unofficial [COLOR FF757677]Open[/COLOR][COLOR FF8ABEE2]ELEC[/COLOR] Mediacenter OS Add-ons"
-                version="4.1.2"
+                name="Unofficial [COLOR FF757677]Open[/COLOR][COLOR FF8ABEE2]ELEC[/COLOR] (@PROJECT@/@ARCH@) Add-ons"
+                version="@PKG_VERSION@"
                 provider-name="unofficial.addon.pro">
         <extension point="xbmc.addon.repository"
                 name="Unofficial OpenELEC.tv Add-on Repository">
@@ -12,7 +12,10 @@
         <extension point="xbmc.addon.metadata">
                 <summary>Unofficial addon repository for OpenELEC</summary>
                 <description>
-[COLOR orange]Use with care. There will be NO end user support for addons in this repository[/COLOR]
+[COLOR red]=== BIG FAT WARNING ===[/COLOR]
+Use this repository at your own risk.
+If your house gets burned, it's your fault, not ours.
+We give no guarantee. We give no support.
                 </description>
                 <disclaimer>This is an unofficial addon repository. please don't ask for support in openelec forum / irc channel</disclaimer>
                 <platform>all</platform>

packages/addons/repository/repository.unofficial.addon.pro/sources/changelog.txt

@@ -1,3 +1,9 @@
+4.3.3
+- rebuild
+
+4.3.2
+- rebuild for addon api bump
+
 4.1.2
 - fix typo in repository name
 

packages/addons/service/multimedia/boblightd/changelog.txt

@@ -1,3 +1,9 @@
+4.3.4
+- update to kodi
+
+4.3.0
+- rebuild for addon api bump
+
 4.1.2
 - rebuild for xlib changes
 

packages/addons/service/multimedia/boblightd/package.mk

@@ -18,7 +18,7 @@
 
 PKG_NAME="boblightd"
 PKG_VERSION="478"
-PKG_REV="2"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"
@@ -42,7 +42,7 @@ if [ "$OPENGL_SUPPORT" = "yes" ] ; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Mesa glu"
 fi
 
-if [ ! "$OPENGL" = "Mesa" ]; then
+if [ "$OPENGL" = "no" ]; then
   EXTRAOPTS="--without-opengl"
 fi
 

packages/addons/service/multimedia/boblightd/source/system.d/service.multimedia.boblightd.service

@@ -3,7 +3,7 @@ Description=boblightd
 After=graphical.target
 
 [Service]
-ExecStart=/bin/sh -c "exec sh /storage/.xbmc/addons/service.multimedia.boblightd/bin/boblightd.start"
+ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.multimedia.boblightd/bin/boblightd.start"
 ExecStopPost=-/bin/sh -c "pidof boblight-X11 && killall -q -9 boblight-X11"
 TimeoutStopSec=1
 Restart=always
@@ -11,4 +11,4 @@ RestartSec=10
 StartLimitInterval=0
 
 [Install]
-WantedBy=xbmc.target
+WantedBy=kodi.target

packages/addons/service/multimedia/tvheadend/changelog.txt

@@ -1,3 +1,28 @@
+4.3.6
+- fix tv_grab_file with --quiet (again!)
+- fix crash on imx6
+
+4.3.5
+- fix crash on imx6
+
+4.3.4
+- update to tvheadend-3.9.2182
+- fix xmltv grab issue
+
+4.3.3
+- update to tvheadend-3.9.2168
+
+4.3.2
+- update to kodi
+
+4.3.1
+- update to tvheadend-3.9.1847
+- tvheadend now has native support for hdhomerun devices
+
+4.3.0
+- rebuild for addon api bump
+- update to tvheadend-3.9.1083
+
 4.1.2
 - fix issues with "wait for frontend init". thanks @sraue
 

packages/addons/service/multimedia/tvheadend/package.mk

@@ -17,14 +17,13 @@
 ################################################################################
 
 PKG_NAME="tvheadend"
-PKG_VERSION="3.9.681"
-PKG_REV="2"
+PKG_VERSION="3.9.2182"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
-#PKG_URL="https://github.com/downloads/tvheadend/tvheadend/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_SITE="http://www.tvheadend.org"
 PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain openssl curl"
+PKG_DEPENDS_TARGET="toolchain libressl curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/multimedia"
 PKG_SHORTDESC="tvheadend (Version: $PKG_VERSION): a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."
@@ -36,6 +35,11 @@ PKG_AUTORECONF="no"
 pre_build_target() {
   mkdir -p $PKG_BUILD/.$TARGET_NAME
   cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
+  export CROSS_COMPILE=$TARGET_PREFIX
+  # meh imx6..
+  if [ "$TARGET_ARCH" == "arm" ] ; then
+    export CFLAGS="$CFLAGS -mno-unaligned-access"
+  fi
 }
 
 configure_target() {
@@ -43,12 +47,17 @@ configure_target() {
             --arch=$TARGET_ARCH \
             --cpu=$TARGET_CPU \
             --cc=$TARGET_CC \
-            --enable-timeshift \
-            --disable-libav \
+            --enable-hdhomerun_client \
+            --enable-hdhomerun_static \
             --disable-avahi \
-            --python=$ROOT/$TOOLCHAIN/bin/python \
+            --disable-libav \
+            --enable-inotify \
+            --enable-epoll \
             --disable-uriparser \
-            --enable-bundle
+            --enable-tvhcsa \
+            --enable-bundle \
+            --disable-dbus_1 \
+            --python=$ROOT/$TOOLCHAIN/bin/python
 }
 
 post_make_target() {

packages/addons/service/multimedia/tvheadend/patches/tvheadend-remove-Werror.patch

@@ -1,12 +1,25 @@
-diff -Naur tvheadend-3.9.1050/Makefile tvheadend-3.9.1050.patch/Makefile
---- tvheadend-3.9.1050/Makefile	2014-07-07 21:39:24.000000000 +0200
-+++ tvheadend-3.9.1050.patch/Makefile	2014-07-14 17:57:09.483454814 +0200
-@@ -28,7 +28,7 @@
+From 67e38551bc3acadf27b3ed4922e897348a612fdb Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Wed, 15 Oct 2014 13:35:09 +0300
+Subject: [PATCH] remove werror
+
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ddcc47e..0087a6c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,7 +28,7 @@ PROG    := $(BUILDDIR)/tvheadend
  #
  
- CFLAGS  += -g -O2
+ CFLAGS  += -g -O2 -Wunused-result
 -CFLAGS  += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations
 +CFLAGS  += -Wall -Wwrite-strings -Wno-deprecated-declarations
  CFLAGS  += -Wmissing-prototypes
  CFLAGS  += -fms-extensions -funsigned-char -fno-strict-aliasing
  CFLAGS  += -D_FILE_OFFSET_BITS=64
+-- 
+1.7.2.5
+

packages/addons/service/multimedia/tvheadend/source/bin/tv_grab_file

@@ -20,65 +20,21 @@
 
 . /etc/profile
 
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.tvheadend"
+ADDON_HOME="$HOME/.kodi/userdata/addon_data/service.multimedia.tvheadend"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 XMLTV_TYPE=`grep XMLTV_TYPE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 XMLTV_LOCATION_FILE=`grep XMLTV_LOCATION_FILE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 XMLTV_LOCATION_WEB=`grep XMLTV_LOCATION_WEB $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 XMLTV_LOCATION_SCRIPT=`grep XMLTV_LOCATION_SCRIPT $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 
-dflag=
-vflag=
-cflag=
-
-if [[ $# -lt 1 ]]; then
-  if [ "$XMLTV_TYPE" = "FILE" ]; then
-    cat "$XMLTV_LOCATION_FILE"
-    exit 0
-  elif [ "$XMLTV_TYPE" = "SCRIPT" ]; then
-    if [ -e "$XMLTV_LOCATION_SCRIPT" ] ; then
-      exec "$XMLTV_LOCATION_SCRIPT"
-    fi
-  elif [ "$XMLTV_TYPE" = "WEB" ]; then
-    wget -qO - "$XMLTV_LOCATION_WEB"
-    exit 0
+if [ "$XMLTV_TYPE" = "FILE" ]; then
+  cat "$XMLTV_LOCATION_FILE"
+  exit 0
+elif [ "$XMLTV_TYPE" = "SCRIPT" ]; then
+  if [ -e "$XMLTV_LOCATION_SCRIPT" ] ; then
+    exec "$XMLTV_LOCATION_SCRIPT"
   fi
-fi
-
-for arg; do
-    delim=""
-    case "$arg" in
-    #translate --gnu-long-options to -g (short options)
-       --description) args="${args}-d ";;
-       --version) args="${args}-v ";;
-       --capabilities) args="${args}-c ";;
-       #pass through anything else
-       *) [[ "${arg:0:1}" == "-" ]] || delim="\""
-           args="${args}${delim}${arg}${delim} ";;
-    esac
-done
-
-#Reset the positional parameters to the short options
-eval set -- $args
-
-while getopts "dvc" option; do
-    case $option in
-        d)  dflag=1;;
-        v)  vflag=1;;
-        c)  cflag=1;;
-        \?) printf "unknown option: -%s\n" $OPTARG
-            printf "Usage: %s: [--description] [--version] [--capabilities] \n" $(basename $0)
-            exit 2
-            ;;
-    esac >&2
-done
-
-if [ "$dflag" ]; then
-   printf "tv_grab_file is a simple grabber that just read the local or web XMLTV formated file\n"
-fi
-if [ "$vflag" ]; then
-   printf "0.1\n"
-fi
-if [ "$cflag" ]; then
-   printf "baseline\n"
+elif [ "$XMLTV_TYPE" = "WEB" ]; then
+  wget -qO - "$XMLTV_LOCATION_WEB"
+  exit 0
 fi

packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start

@@ -59,13 +59,13 @@ if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then
 fi
 
 if [ "$DEBUG" = "yes" ]; then
-  TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
+  TVHEADEND_ARG="-B -C -s -u root -g video -c $ADDON_HOME"
 else
-  TVHEADEND_ARG="-C -u root -g video -c $ADDON_HOME"
+  TVHEADEND_ARG="-B -C -u root -g video -c $ADDON_HOME"
 fi
 
 # start userspace DVB driver/addon
-for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
+for driver_dvb in $(find /storage/.kodi/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
   driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
   logger -t Tvheadend "### Loading userspace DVB driver: $driver_dvb_name ###"
   # use ". " because of variable export

packages/addons/service/multimedia/tvheadend/source/system.d/service.multimedia.tvheadend.service

@@ -3,11 +3,11 @@ Description=TVHeadend Service
 After=graphical.target
 
 [Service]
-ExecStart=/bin/sh -c "exec sh /storage/.xbmc/addons/service.multimedia.tvheadend/bin/tvheadend.start"
+ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.multimedia.tvheadend/bin/tvheadend.start"
 TimeoutStopSec=2
 Restart=always
 RestartSec=2
 StartLimitInterval=0
 
 [Install]
-WantedBy=xbmc.target
+WantedBy=kodi.target

packages/addons/service/multimedia/tvheadend/source/timeshift-config

@@ -1,7 +1,7 @@
 {
 	"enabled": 0,
 	"ondemand": 0,
-	"path": "/storage/.xbmc/userdata/addon_data/service.multimedia.tvheadend/cache/timeshift",
+	"path": "/storage/.kodi/userdata/addon_data/service.multimedia.tvheadend/cache/timeshift",
 	"unlimited_period": 0,
 	"max_period": 3600,
 	"unlimited_size": 0,

packages/addons/service/multimedia/tvheadend/source/xmltv-config

@@ -1,7 +1,7 @@
 {
 	"grabbers": [
 		{
-			"path": "/storage/.xbmc/addons/service.multimedia.tvheadend/bin/tv_grab_file",
+			"path": "/storage/.kodi/addons/service.multimedia.tvheadend/bin/tv_grab_file",
 			"description": "tv_grag_file is a simple grabber that just read the ~/.xmltv/tv_grab_file.xmltv file",
 			"version": "0.1\n",
 			"mtime": 1318774706,
@@ -10,5 +10,5 @@
 	],
 	"grab-interval": 12,
 	"grab-enabled": 1,
-	"current-grabber": "/storage/.xbmc/addons/service.multimedia.tvheadend/bin/tv_grab_file"
+	"current-grabber": "/storage/.kodi/addons/service.multimedia.tvheadend/bin/tv_grab_file"
 }

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

@@ -1,3 +1,13 @@
+4.3.2
+- update to kodi
+
+4.3.1
+- update to vdr-plugin-vnsiserver-a7cb405
+- update to vdr-plugin-dvbapi-2617a7f
+
+4.3.0
+- rebuild for addon api bump
+
 4.1.7
 - add option to override epg charset
 - update to vdr-plugin-vnsiserver-7d4aa81

packages/addons/service/multimedia/vdr-addon/package.mk

@@ -18,8 +18,8 @@
 ################################################################################
 
 PKG_NAME="vdr-addon"
-PKG_VERSION="4.1"
-PKG_REV="7"
+PKG_VERSION="4.3"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"

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

@@ -148,7 +148,7 @@ for config in `find . -type f`; do
 done
 
 # start userspace DVB driver/addon
-for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
+for driver_dvb in $(find /storage/.kodi/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
   driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
   logger -t VDR "### Loading userspace DVB driver: $driver_dvb_name ###"
   # use ". " because of variable export

packages/addons/service/multimedia/vdr-addon/source/system.d/service.multimedia.vdr-addon.service

@@ -3,11 +3,11 @@ Description=vdr
 After=graphical.target
 
 [Service]
-ExecStart=/bin/sh -c "exec sh /storage/.xbmc/addons/service.multimedia.vdr-addon/bin/vdr.start"
+ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.multimedia.vdr-addon/bin/vdr.start"
 TimeoutStopSec=2
 Restart=always
 RestartSec=2
 StartLimitInterval=0
 
 [Install]
-WantedBy=xbmc.target
+WantedBy=kodi.target

packages/audio/alsa-lib/package.mk

@@ -58,8 +58,6 @@ post_configure_target() {
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
 
-  mkdir -p $INSTALL/etc/modprobe.d
-    cp -PR $PKG_DIR/config/alsa-base.conf $INSTALL/etc/modprobe.d
   mkdir -p $INSTALL/usr/config
     cp -PR $PKG_DIR/config/modprobe.d $INSTALL/usr/config
 }

packages/audio/alsa-utils/scripts/soundconfig

@@ -126,8 +126,10 @@ else
 
 # and this for various Fusion devices like Zotac ZBOX
   mixer $card 'Front',0 100% on
+
+# NVidia CK804 sound devices
+  mixer $card 'IEC958 Playback AC97-SPSA' 100%
 fi
 
 exit 0
 )&
-

packages/audio/faad2/patches/faad2-2.7-automake_1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur faad2-2.7-old/configure.in faad2-2.7-new/configure.in
---- faad2-2.7-old/configure.in	2009-02-04 16:51:03.000000000 -0800
-+++ faad2-2.7-new/configure.in	2012-12-30 14:58:33.000000000 -0800
-@@ -25,7 +25,7 @@
- AC_PROG_MAKE_SET
- AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm)
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- AC_ARG_WITH(xmms,[  --with-xmms             compile XMMS-1 plugin],
- 	     WITHXMMS=$withval, WITHXMMS=no)

packages/audio/faad2/patches/faad2-2.7-mp4ff_shared.patch

@@ -1,28 +0,0 @@
-diff -Naur faad2-2.7-old/common/mp4ff/Makefile.am faad2-2.7-new/common/mp4ff/Makefile.am
---- faad2-2.7-old/common/mp4ff/Makefile.am	2009-02-06 06:24:21.000000000 -0800
-+++ faad2-2.7-new/common/mp4ff/Makefile.am	2009-02-11 05:36:14.000000000 -0800
-@@ -1,7 +1,7 @@
--lib_LIBRARIES = libmp4ff.a
--include_HEADERS = mp4ff.h mp4ffint.h
-+lib_LTLIBRARIES = libmp4ff.la
-+include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h
- 
--libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
- 
--libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
--		     mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
-+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-+                      mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
-diff -Naur faad2-2.7-old/frontend/Makefile.am faad2-2.7-new/frontend/Makefile.am
---- faad2-2.7-old/frontend/Makefile.am	2009-02-06 08:03:37.000000000 -0800
-+++ faad2-2.7-new/frontend/Makefile.am	2009-02-11 05:35:52.000000000 -0800
-@@ -5,7 +5,7 @@
- 	   -I$(top_srcdir)/common/mp4ff
- 
- faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
--	     $(top_builddir)/common/mp4ff/libmp4ff.a
-+	     $(top_builddir)/common/mp4ff/libmp4ff.la
- 
- faad_SOURCES = main.c \
- 	       audio.c audio.h \

packages/audio/flac/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="flac"
-PKG_VERSION="1.3.0"
+PKG_VERSION="1.3.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
@@ -33,7 +33,9 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 # package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--disable-rpath \
+PKG_CONFIGURE_OPTS_TARGET="--enable-static \
+                           --disable-shared \
+                           --disable-rpath \
                            --disable-altivec \
                            --disable-doxygen-docs \
                            --disable-thorough-tests \
@@ -49,6 +51,13 @@ else
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-sse"
 fi
 
+pre_configure_target() {
+  # flac-1.3.1 dont build with LTO support
+  strip_lto
+
+  export CFLAGS="$CFLAGS -fPIC -DPIC"
+}
+
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
 }

packages/audio/lame/package.mk

@@ -33,7 +33,9 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 # package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--enable-nasm \
+PKG_CONFIGURE_OPTS_TARGET="--enable-static \
+                           --disable-shared \
+                           --disable-nasm \
                            --disable-rpath \
                            --disable-cpml \
                            --disable-gtktest \

packages/audio/libcdio/package.mk

@@ -44,11 +44,11 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-cxx \
                            --disable-vcd-info \
                            --without-cd-drive \
                            --without-cd-info \
-                           --with-cd-paranoia \
                            --without-cdda-player \
                            --without-cd-read \
                            --without-iso-info \
                            --without-iso-read \
+                           --without-libiconv-prefix \
                            --with-gnu-ld"
 
 pre_configure_target() {

packages/audio/libmad/package.mk

@@ -33,8 +33,9 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 # package specific configure options
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
 if [ $TARGET_ARCH == "x86_64" ] ; then
-  PKG_CONFIGURE_OPTS_TARGET="--enable-accuracy --enable-fpm=64bit"
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-accuracy --enable-fpm=64bit"
 fi
 
 post_makeinstall_target() {

packages/audio/pulseaudio/package.mk

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://pulseaudio.org/"
 PKG_URL="http://www.freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl libcap"
+PKG_DEPENDS_TARGET="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd libressl libcap"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
 PKG_SHORTDESC="pulseaudio: Yet another sound server for Unix"

packages/audio/taglib/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="taglib"
-PKG_VERSION="1.9.1"
+PKG_VERSION="1.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://taglib.github.com/"
-PKG_URL="https://github.com/taglib/taglib/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://taglib.github.io/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain cmake:host zlib"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
@@ -34,10 +34,15 @@ PKG_AUTORECONF="no"
 
 # package specific configure options
 configure_target() {
-  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr ..
+  cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_STATIC=1 ..
 }
 
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
+  # pkgconf hack
   $SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/taglib-config
+  $SED "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc
+  $SED "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc
+  $SED "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc
+  $SED "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc
 }

packages/compress/lzo/package.mk

@@ -33,4 +33,5 @@ PKG_LONGDESC="LZO is a data compression library which is suitable for data de-/c
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
+PKG_CONFIGURE_OPTS_HOST="--disable-shared --enable-static"
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"

packages/compress/xz/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xz"
-PKG_VERSION="5.0.5"
+PKG_VERSION="5.0.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/databases/sqlite/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3080500"
+PKG_VERSION="autoconf-3080704"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"

packages/debug/gdb/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="gdb"
-PKG_VERSION="7.7"
+PKG_VERSION="7.8.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/gdb/"
-PKG_URL="http://ftp.gnu.org/gnu/gdb/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://ftp.gnu.org/gnu/gdb/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain zlib ncurses expat"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"

packages/debug/vdpauinfo/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdpauinfo"
-PKG_VERSION="0.1"
+PKG_VERSION="0.9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/arm-mem/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="arm-mem"
-PKG_VERSION="8a1fbee"
+PKG_VERSION="2e6f275"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="GPL"

packages/devel/automake/patches/automake-01-fix-help2man.patch

@@ -0,0 +1,25 @@
+From fc19cd1da6161ec5602e692488dfc8e670797afe Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Fri, 15 Aug 2014 22:10:03 +0300
+Subject: [PATCH] meh help2man
+
+---
+ Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5a336df..2d2029b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -701,7 +701,7 @@ update_mans = \
+   $(AM_V_GEN): \
+     && $(MKDIR_P) doc \
+     && $(extend_PATH) \
+-    && $(PERL) $(srcdir)/doc/help2man --output=$@
++    && $(PERL) $(srcdir)/doc/help2man --output=$@ --no-discard-stderr
+ 
+ amhello_sources = \
+   doc/amhello/configure.ac \
+-- 
+1.7.2.5
+

packages/devel/binutils/package.mk

@@ -16,19 +16,14 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-# binutils-2.24:
-#  - fails to build with GOLD support on ARM
-#    see https://sourceware.org/bugzilla/show_bug.cgi?id=15639
-#    ld.gold: internal error in do_read_symbols, at build.OpenELEC-RPi.arm-devel/binutils-2.24/gold/arm.cc:6734
-
 PKG_NAME="binutils"
-PKG_VERSION="2.23.2"
+PKG_VERSION="2.24"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/binutils/binutils.html"
 PKG_URL="http://ftp.gnu.org/gnu/binutils/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="ccache:host bison:host flex:host linux:host gmp:host mpfr:host cloog:host ppl:host"
+PKG_DEPENDS_HOST="ccache:host bison:host flex:host linux:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="binutils: A GNU collection of binary utilities"
@@ -40,16 +35,12 @@ PKG_AUTORECONF="no"
 PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
                          --with-sysroot=$SYSROOT_PREFIX \
                          --with-lib-path=$SYSROOT_PREFIX/lib:$SYSROOT_PREFIX/usr/lib \
-                         --with-gmp=$ROOT/$TOOLCHAIN \
-                         --with-mpfr=$ROOT/$TOOLCHAIN \
-                         --with-ppl=$ROOT/$TOOLCHAIN \
-                         --with-cloog=$ROOT/$TOOLCHAIN \
+                         --without-ppl \
+                         --without-cloog \
                          --disable-werror \
                          --disable-multilib \
                          --disable-libada \
                          --disable-libssp \
-                         --disable-ppl-version-check \
-                         --enable-cloog-backend=isl \
                          --enable-version-specific-runtime-libs \
                          --enable-plugins \
                          --enable-gold \
@@ -57,10 +48,6 @@ PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
                          --enable-lto \
                          --disable-nls"
 
-if [ "$TARGET_ARCH" = "x86_64" ]; then
-  PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_HOST --enable-64-bit-bfd"
-fi
-
 pre_configure_host() {
   unset CPPFLAGS
   unset CFLAGS

packages/devel/binutils/patches/binutils-2.23.1-cloog-0.17.patch

@@ -1,25 +0,0 @@
-diff -Naur binutils-2.22/configure binutils-2.22.patch/configure
---- binutils-2.22/configure	2011-08-14 14:28:15.000000000 +0200
-+++ binutils-2.22.patch/configure	2012-05-08 05:57:26.093455382 +0200
-@@ -5946,8 +5946,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
--    || CLOOG_VERSION_MINOR != 16 \
--    || CLOOG_VERSION_REVISION < 1
-+    || CLOOG_VERSION_MINOR != 18
-     choke me
-    #endif
-   ;
-diff -Naur binutils-2.22/configure.ac binutils-2.22.patch/configure.ac
---- binutils-2.22/configure.ac	2011-11-21 12:58:27.000000000 +0100
-+++ binutils-2.22.patch/configure.ac	2012-05-08 05:54:27.974921129 +0200
-@@ -1589,7 +1589,7 @@
-   dnl
-   dnl If we use CLooG-Legacy, the provided version information is
-   dnl ignored.
--  CLOOG_CHECK_VERSION(0,16,1)
-+  CLOOG_CHECK_VERSION(0,18,0)
- 
-   dnl Only execute fail-action, if CLooG has been requested.
-   CLOOG_IF_FAILED([

packages/devel/binutils/patches/binutils-2.23.2-texinfo.patch

@@ -1,21 +0,0 @@
-diff -Naur a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
---- a/bfd/doc/bfd.texinfo	2010-10-28 07:40:25.000000000 -0400
-+++ b/bfd/doc/bfd.texinfo	2013-10-02 15:57:07.556185659 -0400
-@@ -322,7 +322,7 @@
- @printindex cp
-
- @tex
--% I think something like @colophon should be in texinfo.  In the
-+% I think something like @@colophon should be in texinfo.  In the
- % meantime:
- \long\def\colophon{\hbox to0pt{}\vfill
- \centerline{The body of this manual is set in}
-@@ -333,7 +333,7 @@
- \centerline{{\sl\fontname\tensl\/}}
- \centerline{are used for emphasis.}\vfill}
- \page\colophon
--% Blame: doc@cygnus.com, 28mar91.
-+% Blame: doc@@cygnus.com, 28mar91.
- @end tex
-
- @bye

packages/devel/binutils/patches/binutils-2.24-ARM_LTO.patch

@@ -0,0 +1,169 @@
+From f35c4853cc5b0e51d8a460be390f7a20cd44ba44 Mon Sep 17 00:00:00 2001
+From: Cary Coutant <ccoutant@google.com>
+Date: Mon, 7 Jul 2014 10:14:45 -0700
+Subject: [PATCH] Fix internal error with LTO on ARM.
+
+This prevents the target-specific do_read_symbols methods from being called
+twice when do_layout_deferred_sections needs to layout an .eh_frame section.
+
+gold/
+	PR gold/15639
+	* dynobj.h (Sized_dynobj::base_read_symbols): New method.
+	* dynobj.cc (Sized_dynobj::do_read_symbols): Move body to...
+	(Sized_dynobj::base_read_symbols): ...new method.
+	* object.h (Sized_relobj_file::base_read_symbols): New method.
+	* object.cc (Sized_relobj_file::do_read_symbols): Move body to...
+	(Sized_relobj_file::base_read_symbols): ...new method.
+	* arm.cc (Arm_relobj::do_read_symbols): Call base_read_symbols.
+	* mips.cc: (Mips_relobj::do_read_symbols): Likewise.
+	* powerpc.cc (Powerpc_dynobj::do_read_symbols): Likewise.
+---
+ gold/ChangeLog  |   13 +++++++++++++
+ gold/arm.cc     |    4 ++--
+ gold/dynobj.cc  |   11 +++++++++++
+ gold/dynobj.h   |    6 ++++++
+ gold/mips.cc    |    2 +-
+ gold/object.cc  |   12 +++++++++++-
+ gold/object.h   |    5 +++++
+ gold/powerpc.cc |    6 +++---
+ 8 files changed, 52 insertions(+), 7 deletions(-)
+
+diff --git a/gold/arm.cc b/gold/arm.cc
+index 607f9d6..6c472bb 100644
+--- a/gold/arm.cc
++++ b/gold/arm.cc
+@@ -6683,7 +6683,7 @@ void
+ Arm_relobj<big_endian>::do_read_symbols(Read_symbols_data* sd)
+ {
+   // Call parent class to read symbol information.
+-  Sized_relobj_file<32, big_endian>::do_read_symbols(sd);
++  this->base_read_symbols(sd);
+ 
+   // If this input file is a binary file, it has no processor
+   // specific flags and attributes section.
+@@ -6974,7 +6974,7 @@ void
+ Arm_dynobj<big_endian>::do_read_symbols(Read_symbols_data* sd)
+ {
+   // Call parent class to read symbol information.
+-  Sized_dynobj<32, big_endian>::do_read_symbols(sd);
++  this->base_read_symbols(sd);
+ 
+   // Read processor-specific flags in ELF file header.
+   const unsigned char* pehdr = this->get_view(elfcpp::file_header_offset,
+diff --git a/gold/dynobj.cc b/gold/dynobj.cc
+index 2a1b9a3..baf8489 100644
+--- a/gold/dynobj.cc
++++ b/gold/dynobj.cc
+@@ -336,6 +336,17 @@ template<int size, bool big_endian>
+ void
+ Sized_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
+ {
++  this->base_read_symbols(sd);
++}
++
++// Read the symbols and sections from a dynamic object.  We read the
++// dynamic symbols, not the normal symbols.  This is common code for
++// all target-specific overrides of do_read_symbols().
++
++template<int size, bool big_endian>
++void
++Sized_dynobj<size, big_endian>::base_read_symbols(Read_symbols_data* sd)
++{
+   this->read_section_data(&this->elf_file_, sd);
+ 
+   const unsigned char* const pshdrs = sd->section_headers->data();
+diff --git a/gold/dynobj.h b/gold/dynobj.h
+index b8d4b90..03b8053 100644
+--- a/gold/dynobj.h
++++ b/gold/dynobj.h
+@@ -270,6 +270,12 @@ class Sized_dynobj : public Dynobj
+   do_get_global_symbols() const
+   { return this->symbols_; }
+ 
++ protected:
++  // Read the symbols.  This is common code for all target-specific
++  // overrides of do_read_symbols().
++  void
++  base_read_symbols(Read_symbols_data*);
++
+  private:
+   // For convenience.
+   typedef Sized_dynobj<size, big_endian> This;
+diff --git a/gold/object.cc b/gold/object.cc
+index c894c13..1811cda 100644
+--- a/gold/object.cc
++++ b/gold/object.cc
+@@ -755,6 +755,16 @@ template<int size, bool big_endian>
+ void
+ Sized_relobj_file<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
+ {
++  this->base_read_symbols(sd);
++}
++
++// Read the sections and symbols from an object file.  This is common
++// code for all target-specific overrides of do_read_symbols().
++
++template<int size, bool big_endian>
++void
++Sized_relobj_file<size, big_endian>::base_read_symbols(Read_symbols_data* sd)
++{
+   this->read_section_data(&this->elf_file_, sd);
+ 
+   const unsigned char* const pshdrs = sd->section_headers->data();
+@@ -1848,7 +1858,7 @@ Sized_relobj_file<size, big_endian>::do_layout_deferred_sections(Layout* layout)
+ 
+ 	  // Reading the symbols again here may be slow.
+ 	  Read_symbols_data sd;
+-	  this->read_symbols(&sd);
++	  this->base_read_symbols(&sd);
+ 	  this->layout_eh_frame_section(layout,
+ 					sd.symbols->data(),
+ 					sd.symbols_size,
+diff --git a/gold/object.h b/gold/object.h
+index 38b06f0..92cdbdd 100644
+--- a/gold/object.h
++++ b/gold/object.h
+@@ -2214,6 +2214,11 @@ class Sized_relobj_file : public Sized_relobj<size, big_endian>
+   void
+   do_read_symbols(Read_symbols_data*);
+ 
++  // Read the symbols.  This is common code for all target-specific
++  // overrides of do_read_symbols.
++  void
++  base_read_symbols(Read_symbols_data*);
++
+   // Return the value of a local symbol.
+   uint64_t
+   do_local_symbol_value(unsigned int symndx, uint64_t addend) const
+diff --git a/gold/powerpc.cc b/gold/powerpc.cc
+index 96432ed..0a9ab7d 100644
+--- a/gold/powerpc.cc
++++ b/gold/powerpc.cc
+@@ -1839,7 +1839,7 @@ template<int size, bool big_endian>
+ void
+ Powerpc_relobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
+ {
+-  Sized_relobj_file<size, big_endian>::do_read_symbols(sd);
++  this->base_read_symbols(sd);
+   if (size == 64)
+     {
+       const int shdr_size = elfcpp::Elf_sizes<size>::shdr_size;
+@@ -1896,14 +1896,14 @@ Powerpc_dynobj<size, big_endian>::set_abiversion(int ver)
+     }
+ }
+ 
+-// Call Sized_dynobj::do_read_symbols to read the symbols then
++// Call Sized_dynobj::base_read_symbols to read the symbols then
+ // read .opd from a dynamic object, filling in opd_ent_ vector,
+ 
+ template<int size, bool big_endian>
+ void
+ Powerpc_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
+ {
+-  Sized_dynobj<size, big_endian>::do_read_symbols(sd);
++  this->base_read_symbols(sd);
+   if (size == 64)
+     {
+       const int shdr_size = elfcpp::Elf_sizes<size>::shdr_size;
+-- 
+1.7.1

packages/devel/boost/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="boost"
-PKG_VERSION="1_55_0"
+PKG_VERSION="1_57_0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.boost.org/"
-PKG_URL="$SOURCEFORGE_SRC/boost/boost/1.55.0/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
+PKG_URL="$SOURCEFORGE_SRC/boost/boost/1.56.0/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
 PKG_SOURCE_DIR="${PKG_NAME}_${PKG_VERSION}"
 PKG_DEPENDS_HOST=""
 PKG_DEPENDS_TARGET="toolchain boost:host Python:host zlib bzip2"
@@ -35,7 +35,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 make_host() {
-  cd tools/build/v2/engine
+  cd tools/build/src/engine
     sh build.sh
 }
 
@@ -45,9 +45,6 @@ makeinstall_host() {
 }
 
 pre_configure_target() {
-# boost fails building with LTO support
-  strip_lto
-
   export CFLAGS="$CFLAGS -fPIC"
   export CXXFLAGS="$CXXFLAGS -fPIC"
   export LDFLAGS="$LDFLAGS -fPIC"
@@ -59,7 +56,7 @@ configure_target() {
                   --with-python=$ROOT/$TOOLCHAIN/bin/python \
 
   echo "using gcc : `$TARGET_CC -v 2>&1  | tail -n 1 |awk '{print $3}'` : $TARGET_CC  : <compileflags>\"$CFLAGS\" <linkflags>\"$LDFLAGS\" ;" \
-    > tools/build/v2/user-config.jam
+    > tools/build/src/user-config.jam
 }
 
 make_target() {
@@ -69,12 +66,13 @@ make_target() {
 makeinstall_target() {
   $ROOT/$TOOLCHAIN/bin/bjam -d2 --toolset=gcc link=static \
                                 --prefix=$SYSROOT_PREFIX/usr \
-                                  --layout=system \
-                                  --with-thread \
-                                  --with-iostreams \
-                                  --with-system \
-                                  --with-serialization \
-                                  --with-filesystem \
-                                  --with-regex -sICU_PATH="$SYSROOT_PREFIX/usr" \
-                                  install
+                                --ignore-site-config \
+                                --layout=system \
+                                --with-thread \
+                                --with-iostreams \
+                                --with-system \
+                                --with-serialization \
+                                --with-filesystem \
+                                --with-regex -sICU_PATH="$SYSROOT_PREFIX/usr" \
+                                install
 }

packages/devel/cloog/package.mk

@@ -1,44 +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="cloog"
-PKG_VERSION="0.18.2"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="LGPL"
-PKG_SITE="http://www.cloog.org/"
-PKG_URL="http://www.bastoul.net/cloog/pages/download/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="ccache:host gmp:host"
-PKG_PRIORITY="optional"
-PKG_SECTION="toolchain/math"
-PKG_SHORTDESC="cloog: a free software and library to generate code for scanning Z-polyhedra."
-PKG_LONGDESC="CLooG is a library to generate code for scanning Z-polyhedra. In other words, it finds code that reaches each integral point of one or more parameterized polyhedra. GCC links with this library in order to enable the new loop generation code known as Graphite."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
-
-# TODO: automake 1.13 support must be fixed
-
-PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
-                         --enable-shared \
-                         --disable-static \
-                         --disable-silent-rules \
-                         --with-gnu-ld \
-                         --with-isl=buildin \
-                         --with-gmp=system \
-                         --with-gmp-prefix=$ROOT/$TOOLCHAIN"

packages/devel/cloog/patches/cloog-0.18.0-automake.patch

@@ -1,12 +0,0 @@
-diff -Naur cloog-0.17.0/Makefile.am cloog-0.17.0.patch/Makefile.am
---- cloog-0.17.0/Makefile.am	2011-12-08 12:03:08.000000000 +0100
-+++ cloog-0.17.0.patch/Makefile.am	2012-06-13 14:05:03.611679108 +0200
-@@ -145,7 +145,7 @@
- 	examples
- 
- install-data-local:
--	@test -z "$(pkgconfig_libdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfig_libdir)"
-+	@test -z "$(pkgconfig_libdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfig_libdir)"
- 	$(INSTALL_DATA) $(pkgconfig_libfile) "$(DESTDIR)$(pkgconfig_libdir)/$(pkgconfig_libfile)"
- 
- uninstall-local:

packages/devel/cloog/patches/cloog-buildfix.patch

@@ -1,26 +0,0 @@
-diff -Naur cloog-0.18.2/Makefile.am cloog-0.18.2.patch/Makefile.am
---- cloog-0.18.2/Makefile.am	2013-12-18 13:27:49.000000000 +0100
-+++ cloog-0.18.2.patch/Makefile.am	2014-06-22 17:51:19.285392908 +0200
-@@ -147,9 +147,7 @@
- 	@test -z "$(pkgconfig_libdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfig_libdir)"
- 	$(INSTALL_DATA) $(pkgconfig_libfile) "$(DESTDIR)$(pkgconfig_libdir)/$(pkgconfig_libfile)"
- 	@test -z "$(DESTDIR)$(libdir)/isl" || $(mkdir_p) "$(DESTDIR)$(libdir)/isl"
--	$(INSTALL_DATA) "$(top_srcdir)/cmake/isl-config.cmake" "$(DESTDIR)$(libdir)/isl/"
- 	@test -z "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)" || $(mkdir_p) "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)"
--	$(INSTALL_DATA) "$(top_srcdir)/cmake/cloog-isl-config.cmake" "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)/"
- 
- uninstall-local:
- 	rm -f "$(DESTDIR)$(pkgconfig_libdir)/$(pkgconfig_libfile)"
-diff -Naur cloog-0.18.2/Makefile.in cloog-0.18.2.patch/Makefile.in
---- cloog-0.18.2/Makefile.in	2013-12-18 13:36:08.000000000 +0100
-+++ cloog-0.18.2.patch/Makefile.in	2014-06-22 17:51:27.580413087 +0200
-@@ -1342,9 +1342,7 @@
- 	@test -z "$(pkgconfig_libdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfig_libdir)"
- 	$(INSTALL_DATA) $(pkgconfig_libfile) "$(DESTDIR)$(pkgconfig_libdir)/$(pkgconfig_libfile)"
- 	@test -z "$(DESTDIR)$(libdir)/isl" || $(mkdir_p) "$(DESTDIR)$(libdir)/isl"
--	$(INSTALL_DATA) "$(top_srcdir)/cmake/isl-config.cmake" "$(DESTDIR)$(libdir)/isl/"
- 	@test -z "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)" || $(mkdir_p) "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)"
--	$(INSTALL_DATA) "$(top_srcdir)/cmake/cloog-isl-config.cmake" "$(DESTDIR)$(libdir)/$(PACKAGE_NAME)/"
- 
- uninstall-local:
- 	rm -f "$(DESTDIR)$(pkgconfig_libdir)/$(pkgconfig_libfile)"

packages/devel/cmake/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="cmake"
-PKG_VERSION="3.0.0"
+PKG_VERSION="3.0.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/devel/dbus-glib/package.mk

@@ -23,8 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freedesktop.org/wiki/Software/dbus"
 PKG_URL="http://dbus.freedesktop.org/releases/dbus-glib/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="glib:host dbus:host"
-PKG_DEPENDS_TARGET="toolchain dbus glib expat dbus-glib:host"
+PKG_DEPENDS_TARGET="toolchain dbus glib expat"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="dbus-glib: A message bus system"
@@ -40,13 +39,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_have_abstract_sockets=yes \
                            --disable-shared \
                            --disable-tests \
                            --disable-bash-completion \
-                           --enable-asserts=no \
-                           --with-introspect-xml=$PKG_BUILD/.$HOST_NAME/introspect.xml \
-                           --with-dbus-binding-tool=$ROOT/$TOOLCHAIN/bin/dbus-binding-tool"
-
-PKG_CONFIGURE_OPTS_HOST="--disable-tests \
-                         --disable-bash-completion \
-                         --enable-asserts=yes"
+                           --enable-asserts=no"
 
 pre_configure_target() {
   CFLAGS="$CFLAGS -fPIC -DPIC"

packages/devel/dbus-glib/patches/dbus-glib-01-dont-build-tools-examples.patch

@@ -0,0 +1,38 @@
+From a45f914870e923741f3123799bd9e126b5da4aa0 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Wed, 20 Aug 2014 22:43:28 +0300
+Subject: [PATCH] dont build tools / examples
+
+---
+ Makefile.am      |    4 ++--
+ dbus/Makefile.am |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index dd76c7e..78cb56f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,8 +1,8 @@
+ ACLOCAL_AMFLAGS = -I m4
+ GLIB_PC=dbus-glib-1.pc
+ 
+-SUBDIRS=dbus tools test doc
+-DIST_SUBDIRS=dbus tools test doc m4
++SUBDIRS=dbus test doc
++DIST_SUBDIRS=dbus test doc m4
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = $(GLIB_PC)
+diff --git a/dbus/Makefile.am b/dbus/Makefile.am
+index 6d885f9..8bc102d 100644
+--- a/dbus/Makefile.am
++++ b/dbus/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = . examples
++SUBDIRS = .
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir)						\
+-- 
+1.7.2.5
+

packages/devel/elfutils/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="elfutils"
-PKG_VERSION="0.158"
+PKG_VERSION="0.159"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -35,6 +35,7 @@ PKG_AUTORECONF="yes"
 PKG_CONFIGURE_OPTS_TARGET="utrace_cv_cc_biarch=false \
                            --disable-werror \
                            --disable-progs \
+                           --disable-nls \
                            --with-zlib \
                            --without-bzlib \
                            --without-lzma"

packages/devel/elfutils/patches/elfutils-0.158-CVE-2014-0172.patch

@@ -1,28 +0,0 @@
-commit 7f1eec317db79627b473c5b149a22a1b20d1f68f
-Author: Mark Wielaard <mjw@redhat.com>
-Date:   Wed Apr 9 11:33:23 2014 +0200
-
-    CVE-2014-0172 Check for overflow before calling malloc to uncompress data.
-    
-    https://bugzilla.redhat.com/show_bug.cgi?id=1085663
-    
-    Reported-by: Florian Weimer <fweimer@redhat.com>
-    Signed-off-by: Mark Wielaard <mjw@redhat.com>
-
-diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c
-index 79daeac..34ea373 100644
---- a/libdw/dwarf_begin_elf.c
-+++ b/libdw/dwarf_begin_elf.c
-@@ -282,6 +282,12 @@ check_section (Dwarf *result, GElf_Ehdr *ehdr, Elf_Scn *scn, bool inscngrp)
- 	    memcpy (&size, data->d_buf + 4, sizeof size);
- 	    size = be64toh (size);
- 
-+	    /* Check for unsigned overflow so malloc always allocated
-+	       enough memory for both the Elf_Data header and the
-+	       uncompressed section data.  */
-+	    if (unlikely (sizeof (Elf_Data) + size < size))
-+	      break;
-+
- 	    Elf_Data *zdata = malloc (sizeof (Elf_Data) + size);
- 	    if (unlikely (zdata == NULL))
- 	      break;

packages/devel/elfutils/patches/elfutils-0.158-mod-e_type.patch

@@ -1,62 +0,0 @@
-commit 65cefbd0793c0f9e90a326d7bebf0a47c93294ad
-Author: Josh Stone <jistone@redhat.com>
-Date:   Tue Mar 11 10:19:28 2014 -0700
-
-    libdwfl: dwfl_module_getdwarf.c (open_elf) only (re)set mod->e_type once.
-    
-    As noted in https://sourceware.org/bugzilla/show_bug.cgi?id=16676#c2 for
-    systemtap, the heuristic used by open_elf to set the kernel Dwfl_Module
-    type to ET_DYN, even if the underlying ELF file e_type was set to
-    ET_EXEC, could trigger erroneously for non-kernel/non-main (debug or
-    aux) files.  Make sure we only set the e_type of the module once when
-    processing the main file (when the phdrs can be trusted).
-
-diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
-index c4bd739..f8de80b 100644
---- a/libdwfl/dwfl_module_getdwarf.c
-+++ b/libdwfl/dwfl_module_getdwarf.c
-@@ -1,5 +1,5 @@
- /* Find debugging and symbol information for a module in libdwfl.
--   Copyright (C) 2005-2012 Red Hat, Inc.
-+   Copyright (C) 2005-2012, 2014 Red Hat, Inc.
-    This file is part of elfutils.
- 
-    This file is free software; you can redistribute it and/or modify
-@@ -77,7 +77,7 @@ open_elf (Dwfl_Module *mod, struct dwfl_file *file)
-       return DWFL_E (LIBELF, elf_errno ());
-     }
- 
--  if (mod->e_type != ET_REL)
-+  if (ehdr->e_type != ET_REL)
-     {
-       /* In any non-ET_REL file, we compute the "synchronization address".
- 
-@@ -131,11 +131,24 @@ open_elf (Dwfl_Module *mod, struct dwfl_file *file)
- 	}
-     }
- 
--  mod->e_type = ehdr->e_type;
-+  /* We only want to set the module e_type explictly once, derived from
-+     the main ELF file.  (It might be changed for the kernel, because
-+     that is special - see below.)  open_elf is always called first for
-+     the main ELF file, because both find_dw and find_symtab call
-+     __libdwfl_getelf first to open the main file.  So don't let debug
-+     or aux files override the module e_type.  The kernel heuristic
-+     below could otherwise trigger for non-kernel/non-main files, since
-+     their phdrs might not match the actual load addresses.  */
-+  if (file == &mod->main)
-+    {
-+      mod->e_type = ehdr->e_type;
- 
--  /* Relocatable Linux kernels are ET_EXEC but act like ET_DYN.  */
--  if (mod->e_type == ET_EXEC && file->vaddr != mod->low_addr)
--    mod->e_type = ET_DYN;
-+      /* Relocatable Linux kernels are ET_EXEC but act like ET_DYN.  */
-+      if (mod->e_type == ET_EXEC && file->vaddr != mod->low_addr)
-+	mod->e_type = ET_DYN;
-+    }
-+  else
-+    assert (mod->main.elf != NULL);
- 
-   return DWFL_E_NOERROR;
- }

packages/devel/enca/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="enca"
-PKG_VERSION="1.14"
+PKG_VERSION="1.16"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freshmeat.net/projects/enca/"
-PKG_URL="http://dl.cihar.com/enca/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://dl.cihar.com/enca/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"