config/version: set version to 5.0.1

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

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,11 +8,8 @@
     <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>
-@EXTENSIONS@
   <extension point="xbmc.addon.metadata">
     <summary>@PKG_SHORTDESC@</summary>
     <description>

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

@@ -414,7 +414,6 @@ fi
   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/noobs/partitions.json

@@ -1,7 +1,7 @@
 {
   "partitions": [
     {
-      "label":                     "System",
+      "label":                     "@DISTRONAME@System",
       "filesystem_type":           "FAT",
       "partition_size_nominal":    160,
       "want_maximised":            false,
@@ -9,7 +9,7 @@
       "mkfs_options":              ""
     },
     {
-      "label":                     "Storage",
+      "label":                     "@DISTRONAME@Storage",
       "filesystem_type":           "ext4",
       "partition_size_nominal":    864,
       "want_maximised":            true,

config/options

@@ -65,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

config/path

@@ -20,6 +20,10 @@ HOST_NAME=`$LOCAL_CC -dumpmachine`
 TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI}
 
 BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION
+if [ -n "$BUILD_SUFFIX" ]; then
+  BUILD=$BUILD-$BUILD_SUFFIX
+fi
+
 TARGET_IMG=$ROOT/$TARGET
 TARGET_ADDONS="$TARGET_IMG/$ADDONS/$ADDON_PATH"
 ADDON_BUILD="$BUILD/$ADDONS/$1"

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="4.95.2"
+  OPENELEC_VERSION="5.0.1"
 
 # OS_VERSION: OS Version
   OS_VERSION="5.0"

distributions/OpenELEC/options

@@ -113,9 +113,6 @@
 # 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"
 
@@ -200,11 +197,6 @@
 # This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
   INITRAMFS_PARTED_SUPPORT="no"
 
-# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
-# Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-  FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
-
 # build with swap support (yes / no)
   SWAP_SUPPORT="no"
 

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

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="cxxtools"
-PKG_VERSION="2.2"
+PKG_VERSION="2.2.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"

packages/addons/driver/hdhomerun/changelog.txt

@@ -1,3 +1,5 @@
+4.3.2
+  allow running scripts from addon settings
 4.3.1
   rebuild for addon api bump
 4.3.0

packages/addons/driver/hdhomerun/package.mk

@@ -18,7 +18,7 @@
 
 PKG_NAME="hdhomerun"
 PKG_VERSION="4.3"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"

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,5 +1,3 @@
-#!/bin/sh
-
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
@@ -18,27 +16,17 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-. /etc/profile
+import os
+import sys
+import xbmcaddon
 
-oe_setup_addon service.multimedia.tvheadend
+__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'))
 
-SERVICE="service.multimedia.tvheadend"
-
-case "$1" in
-  pre)
-    if systemctl is-active "$SERVICE" &>/dev/null ; then
-      systemctl stop "$SERVICE"
-      for module in $REMOVE_MODULES ; do
-        rmmod $module
-      done
-    fi
-    ;;
-  post)
-    if systemctl is-enabled "$SERVICE" &>/dev/null ; then
-      for module in $REMOVE_MODULES ; do
-        modprobe $module
-      done
-      systemctl start "$SERVICE"
-    fi
-    ;;
-esac
+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/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,13 +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

@@ -18,7 +18,7 @@
 
 PKG_NAME="imon-mce"
 PKG_VERSION="4.3"
-PKG_REV="0"
+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,6 +1,6 @@
 4.3.4
   fixed xbmc/kodi rebranding error
-  removed driver update option (can't run script from addon settings anymore)
+  some fixes
 4.3.3
   addon transformed to service addon
   new addon settings option to enable to check for new driver at boot

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

@@ -47,10 +47,17 @@ 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
+  
   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
 }
 

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

@@ -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
@@ -78,7 +78,7 @@ if [ "$CHECK_BOOT" = "true" ]; then
     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\", 7000, $SUNDTEK_ADDON_DIR/icon.png)"
+      kodi-send -a "Notification(Sundtek, \"New driver version exist, update manually\", 4000, $SUNDTEK_ADDON_DIR/icon.png)"
     fi
 )&
   fi

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

@@ -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

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

@@ -24,18 +24,35 @@ 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"
 
-logger -t Sundtek "### Starting updating driver ###"
-kodi-send -a "Notification(Sundtek, Starting updating driver, 2000, $SUNDTEK_ADDON_DIR/icon.png)"
+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, Can't get latest version, 8000, $SUNDTEK_ADDON_DIR/icon.png)"
+  kodi-send -a "Notification(Sundtek, Cant get latest version, 8000, $SUNDTEK_ADDON_DIR/icon.png)"
   cd ..
   rm -fr tmp/
   exit 1
@@ -66,6 +83,7 @@ if [ $? -ne 0 ]; then
   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
@@ -77,12 +95,12 @@ if [ $? -ne 0 ]; then
   exit 4
 fi
 
+# fix permissions
 chmod -R 755 opt/ etc/
 
-killall -9 mediaclient &>/dev/null
-killall -9 mediasrv &>/dev/null
-
-chmod 755 opt/bin/*
+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/
@@ -93,4 +111,9 @@ 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

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

@@ -15,29 +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 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 __name__ == "__main__" and len(sys.argv) == 2:
-  if 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()
-  elif sys.argv[1] == '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/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/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

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,13 +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" action="RunScript($ID, update_driver)" />
+    <setting label="3010" option="close" type="action" id="update_driver" action="RunScript($CWD/resources/actions.py, update_driver)" />
   </category>
--->
 </settings>

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

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="repository.unofficial.addon.pro"
-PKG_VERSION="4.3.3"
-PKG_REV="0"
+PKG_VERSION="4.3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://unofficial.addon.pro"
@@ -43,6 +43,7 @@ make_target() {
      -e "s|@PROJECT@|$PROJECT|g" \
      -e "s|@ARCH@|$TARGET_ARCH|g" \
      -e "s|@PKG_VERSION@|$PKG_VERSION|g" \
+     -e "s|@PKG_REV@|$PKG_REV|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] (@PROJECT@/@ARCH@) Add-ons"
-                version="@PKG_VERSION@"
+                version="@PKG_VERSION@.@PKG_REV@"
                 provider-name="unofficial.addon.pro">
         <extension point="xbmc.addon.repository"
                 name="Unofficial OpenELEC.tv Add-on Repository">

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

@@ -1,3 +1,6 @@
+4.3.5
+- added boblight-aml
+
 4.3.4
 - update to kodi
 

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

@@ -18,7 +18,7 @@
 
 PKG_NAME="boblightd"
 PKG_VERSION="478"
-PKG_REV="4"
+PKG_REV="5"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"
@@ -63,6 +63,7 @@ addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P $PKG_BUILD/.$TARGET_NAME/src/boblightd $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P $PKG_BUILD/.$TARGET_NAME/src/boblight-constant $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_BUILD/.$TARGET_NAME/src/boblight-aml $ADDON_BUILD/$PKG_ADDON_ID/bin
   if [ "$DISPLAYSERVER" = "x11" ] ; then
     cp -P $PKG_BUILD/.$TARGET_NAME/src/boblight-X11 $ADDON_BUILD/$PKG_ADDON_ID/bin
   fi

packages/addons/service/multimedia/boblightd/patches/boblightd-2.0.5-add_aml_client.patch

@@ -0,0 +1,632 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9ba5381..c5a4dc6 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -7,6 +7,7 @@ AM_CFLAGS =\
+ 	 -g
+ 
+ bin_PROGRAMS = boblightd \
++	boblight-aml \
+ 	boblight-constant
+         
+ 
+@@ -19,6 +20,11 @@ endif
+ 
+ endif
+ 
++boblight_aml_SOURCES  = clients/boblight-aml/boblight-aml.cpp
++boblight_aml_SOURCES += clients/boblight-aml/flagmanager-aml.cpp
++boblight_aml_SOURCES += clients/flagmanager.cpp
++boblight_aml_SOURCES += util/misc.cpp
++
+ boblight_v4l_SOURCES = \
+ 	clients/boblight-v4l/boblight-v4l.cpp \
+ 	clients/boblight-v4l/flagmanager-v4l.cpp \
+diff -urPp src/clients/boblight-aml.cpp src/clients/boblight-aml/boblight-aml.cpp
+--- /dev/null	Thu Jan  1 00:00:00 1970
++++ b/src/clients/boblight-aml/boblight-aml.cpp	Thu Jan 15 10:24:16 2015
+@@ -0,0 +1,491 @@
++/*
++ * boblight
++ * Copyright (C) Bob  2009 
++ * 
++ * boblight is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ * 
++ * boblight is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++ * See the GNU General Public License for more details.
++ * 
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#define BOBLIGHT_DLOPEN
++#include "lib/boblight.h"
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++#include <signal.h>
++#include <algorithm>
++
++#include <fcntl.h>
++#include <errno.h>
++#include <sys/stat.h>
++#include <sys/poll.h>
++#include <sys/types.h>
++#include <sys/time.h>
++#include <sys/ioctl.h>
++
++#include "config.h"
++#include "util/misc.h"
++#include "util/timeutils.h"
++#include "flagmanager-aml.h"
++
++using namespace std;
++
++//from linux/amlogic/amports/amvideocap.h
++#define AMVIDEOCAP_IOC_MAGIC 'V'
++#define AMVIDEOCAP_IOW_SET_WANTFRAME_WIDTH      _IOW(AMVIDEOCAP_IOC_MAGIC, 0x02, int)
++#define AMVIDEOCAP_IOW_SET_WANTFRAME_HEIGHT     _IOW(AMVIDEOCAP_IOC_MAGIC, 0x03, int)
++
++
++// helper class - tries to load the "movie" settings from the script.xbmc.boblight addon
++// and pass them to the boblight-aml client
++class CBoblightAddonSettings
++{
++  public:
++    CBoblightAddonSettings() : m_bobdisable(false), m_settingsLoaded(false)
++    { 
++      m_settingsLoaded = loadBoblightAddonSettings();
++    }
++
++    std::string getBoblightClientCmdLine()
++    {
++      std::string cmdLine = "";
++      //convert bool string to lowercase
++      transform(m_interpolation.begin(), m_interpolation.end(), m_interpolation.begin(), ::tolower);
++
++      cmdLine += "-s " + m_ip + ":" + m_port;
++      cmdLine += " -o autospeed=" + m_autospeed;
++      cmdLine += " -o interpolation=" + m_interpolation;
++      cmdLine += " -o saturation=" + m_saturation;
++      cmdLine += " -o speed=" + m_speed;
++      cmdLine += " -o threshold=" + m_threshold;
++      cmdLine += " -o value=" + m_value;
++      return cmdLine;
++    }
++
++    bool m_bobdisable;
++    bool m_settingsLoaded;
++    std::string m_ip;
++    std::string m_port;
++    std::string m_autospeed;
++    std::string m_interpolation;
++    std::string m_saturation;
++    std::string m_speed;
++    std::string m_threshold;
++    std::string m_value;
++
++  private:
++    #define SETTINGS_ATTR_BOBDISABLE     "bobdisable"
++    #define SETTINGS_ATTR_IP             "hostip"
++    #define SETTINGS_ATTR_PORT           "hostport"
++    #define SETTINGS_ATTR_AUTOSPEED      "movie_autospeed"
++    #define SETTINGS_ATTR_INTERPOLATION  "movie_interpolation"
++    #define SETTINGS_ATTR_SATURATION     "movie_saturation"
++    #define SETTINGS_ATTR_SPEED          "movie_speed"
++    #define SETTINGS_ATTR_THRESHOLD      "movie_threshold"
++    #define SETTINGS_ATTR_VALUE          "movie_value"
++    #define KODI_HOME_ENV_VAR            "HOME"
++
++    bool loadBoblightAddonSettings()
++    {
++      bool ret = false;
++      char *kodiHome = getenv(KODI_HOME_ENV_VAR);
++      //fallback to custom settings file in case boblight addon is not installed
++      std::string settingsFile = "/storage/boblight-aml.xml";
++
++      if (kodiHome != NULL)
++      {
++        settingsFile = std::string(kodiHome) + "/.kodi/userdata/addon_data/script.xbmc.boblight/settings.xml";
++      }
++
++      FILE *fd = fopen(settingsFile.c_str(), "r");
++
++      if (fd != NULL)
++      {
++        fseek(fd, 0, SEEK_END);
++        size_t fileSize = ftell(fd);
++        fseek(fd, 0, SEEK_SET);
++        if (fileSize > 0)
++        {
++          if (fileSize > 32000)//read 16k max - there shouldn't be a bigger settings.xml from boblight [tm]
++            fileSize = 32000;
++          char *xmlBuffer = new char[fileSize];
++          size_t readCount = fread(xmlBuffer, fileSize, 1, fd);
++          fclose(fd);
++
++          if (readCount == 1)
++          {
++            parseBoblightSettings(std::string(xmlBuffer));
++            ret = true;
++          }
++          else
++          {
++            fprintf(stderr, "Failed reading boblight addon settings.xml");
++          }
++          delete[] xmlBuffer;
++        }
++      }
++      return ret;
++    }
++
++    void parseBoblightSettings(std::string xmlBuffer)
++    {
++      std::string settings_bobdisable_str;
++      settings_bobdisable_str = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_BOBDISABLE);
++      if (settings_bobdisable_str == "true" || settings_bobdisable_str == "True")
++        m_bobdisable = true;
++
++      m_ip = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_IP);
++      m_port = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_PORT);
++      m_autospeed = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_AUTOSPEED);
++      m_interpolation = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_INTERPOLATION);
++      m_saturation = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_SATURATION);
++      m_speed = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_SPEED);
++      m_threshold = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_THRESHOLD);
++      m_value = getValueFromXmlBuffer(xmlBuffer, SETTINGS_ATTR_VALUE);
++    }
++
++    std::string getValueFromXmlBuffer(const std::string &xmlBuffer, const char* xmlAttribute)
++    {
++      size_t strPos = 0;
++      std::string valueStr;
++
++      // each line in the xml looks like this:
++      // <setting id="movie_value" value="1.000006" />
++      // find the attribute
++      if ((strPos = xmlBuffer.find(xmlAttribute)) != std::string::npos)
++      {
++        size_t strPos2 = 0;
++        // from movie_value" value="1.000006" /> look for "value"
++        if ((strPos2 = xmlBuffer.find("value", strPos)) != std::string::npos)
++        {
++          size_t strPos3 = 0;
++          // from value="1.000006" /> look for "="
++          if ((strPos3 = xmlBuffer.find("=", strPos2)) != std::string::npos)
++          {
++            //extract the value - strPos3 points to ="1.000006"
++            int valueOffset = 1; //skip the "="
++            if (xmlBuffer[strPos3 + valueOffset] == '"')
++              valueOffset++;//skip " if needed
++            int strLen = 0;
++            do
++            {
++              // value stops with " or space
++              if (xmlBuffer[strPos3 + valueOffset + strLen] == '"' ||
++                xmlBuffer[strPos3 + valueOffset + strLen] == ' ')
++                break;
++              strLen++;
++            } while (strLen < 20);// no insane xml garbage ...
++
++            valueStr = xmlBuffer.substr(strPos3 + valueOffset, strLen);
++          }
++        }
++      }
++      return valueStr;
++    }
++};
++
++struct aml_snapshot_t {
++  unsigned int  dst_width;
++  unsigned int  dst_height;
++  unsigned int  dst_stride;
++  unsigned int  dst_size;
++  void         *dst_vaddr;
++};
++
++volatile bool g_stop = false;
++CFlagManagerAML g_flagmanager;
++/*********************************************************
++ *********************************************************/
++static void SignalHandler(int signum)
++{
++  if (signum == SIGTERM)
++  {
++    fprintf(stderr, "caught SIGTERM\n");
++    g_stop = true;
++  }
++  else if (signum == SIGINT)
++  {
++    fprintf(stderr, "caught SIGTERM\n");
++    g_stop = true;
++  }
++}
++
++#define VIDEO_PATH       "/dev/amvideo"
++#define AMSTREAM_IOC_MAGIC  'S'
++#define AMSTREAM_IOC_GET_VIDEO_DISABLE  _IOR(AMSTREAM_IOC_MAGIC, 0x48, unsigned long)
++static int amvideo_utils_video_playing()
++{
++  int video_fd;
++  int video_disable;
++
++  video_fd = open(VIDEO_PATH, O_RDWR);
++  if (video_fd < 0) {
++    return -1;
++  }
++
++  ioctl(video_fd, AMSTREAM_IOC_GET_VIDEO_DISABLE, &video_disable);
++  if (video_disable)
++  {
++    close(video_fd);
++    return 1;
++  }
++
++  close(video_fd);
++
++//  fprintf(stderr, "pos x %d y %d w %d h %d\n",snapshot.src_x, snapshot.src_y,snapshot.src_width,snapshot.src_height);
++  return 0;
++}
++
++static int capture_frame(int fd, aml_snapshot_t &snapshot)
++{
++  int ret = 0;
++  
++  ssize_t readResult = pread(fd, snapshot.dst_vaddr, snapshot.dst_size, 0);
++
++  if (readResult < snapshot.dst_size)
++  {
++    fprintf(stderr, "frame read returned %d\n", readResult);
++  }
++  //fprintf(stderr, "requ: %d read %d \n", snapshot.dst_size, readResult);
++  fprintf(stderr, ".");
++  return ret;
++}
++
++static int configure_capture(int fd, aml_snapshot_t &snapshot)
++{
++  int ret = 0;
++  int ioctlret = 0;
++
++  if ((ioctlret = ioctl(fd, AMVIDEOCAP_IOW_SET_WANTFRAME_WIDTH, snapshot.dst_width)) != 0)
++  {
++    ret = 2;
++    fprintf(stderr, "Error setting frame width (ret: %d errno: %d)\n", ioctlret, errno);
++  }
++    
++  
++  if ((ioctlret = ioctl(fd, AMVIDEOCAP_IOW_SET_WANTFRAME_HEIGHT, snapshot.dst_height)) != 0)
++  {
++    ret = 3;
++    fprintf(stderr, "Error setting frame height (ret: %d errno: %d)\n", ioctlret, errno);
++  }
++
++  return ret;
++}
++
++static void frameToboblight(void *boblight, uint8_t* outputptr, int w, int h, int stride)
++{
++  if (!boblight)
++  {
++    fprintf(stderr, "no boblight\n");
++    return;
++  }
++  if (!outputptr)
++  {
++    fprintf(stderr, "no outputptr\n");
++    return;
++  }
++  //read out pixels and hand them to libboblight
++  uint8_t* buffptr;
++  for (int y = h; y > 0; y--) {
++    buffptr = outputptr + stride * y;
++    for (int x = 0; x < w; x++) {
++      int rgb[3];
++      rgb[2] = *(buffptr++);
++      rgb[1] = *(buffptr++);
++      rgb[0] = *(buffptr++);
++
++      //fprintf(stdout, "frameToboblight: x(%d), y(%d)\n", x, y);
++
++      boblight_addpixelxy(boblight, x, y, rgb);
++    }
++  }
++}
++
++static int Run(void* boblight)
++{
++  int snapshot_fd = -1;               
++  aml_snapshot_t aml_snapshot = {0};
++  int lastPriority = 255;
++
++  aml_snapshot.dst_width  = 160;
++  aml_snapshot.dst_height = 160;
++
++  // calc stride, size and alloc mem
++  aml_snapshot.dst_stride = aml_snapshot.dst_width  * 3;
++  aml_snapshot.dst_size   = aml_snapshot.dst_stride * aml_snapshot.dst_height;
++  aml_snapshot.dst_vaddr  = calloc(aml_snapshot.dst_size, 1);
++
++  fprintf(stdout, "Connection to boblightd config: width(%d), height(%d)\n",
++    aml_snapshot.dst_width, aml_snapshot.dst_height);
++  //tell libboblight how big our image is
++  boblight_setscanrange(boblight, (int)aml_snapshot.dst_width, (int)aml_snapshot.dst_height);
++
++  while(!g_stop)
++  {
++    int64_t bgn = GetTimeUs();
++
++    if (snapshot_fd == -1) {
++      snapshot_fd = open(g_flagmanager.m_device.c_str(), O_RDWR, 0);
++
++      if (snapshot_fd == -1) {
++        sleep(1);
++        continue;
++      } else {
++        fprintf(stdout, "snapshot_fd(%d) \n", snapshot_fd);
++      }
++    }
++
++    // match source ratio if possible
++    if (amvideo_utils_video_playing() != 0) {
++      if ( lastPriority != 255)
++      {
++        boblight_setpriority(boblight, 255);
++        lastPriority = 255;
++      }
++      sleep(1);
++      continue;
++    }
++
++    if (configure_capture(snapshot_fd, aml_snapshot) == 0)
++    {
++      if (capture_frame(snapshot_fd, aml_snapshot) == 0)
++      {
++        // image to boblight convert.
++        frameToboblight(boblight, (uint8_t*)aml_snapshot.dst_vaddr,
++        aml_snapshot.dst_width, aml_snapshot.dst_height, aml_snapshot.dst_stride);
++  
++        if (lastPriority != g_flagmanager.m_priority)
++        {
++          boblight_setpriority(boblight, g_flagmanager.m_priority);
++          lastPriority = g_flagmanager.m_priority;
++        }
++        if (!boblight_sendrgb(boblight, 1, NULL))
++        {
++          // some error happened, probably connection broken, so bitch and try again
++          PrintError(boblight_geterror(boblight));
++          boblight_destroy(boblight);
++          continue;
++        }
++      }
++      else
++      {
++        fprintf(stdout, "nap time\n");
++        sleep(1);
++      }
++    }
++    int64_t end = GetTimeUs();
++    float calc_time_ms = (float)(end - bgn) / 1000.0;
++    // throttle to 100ms max cycle rate
++    calc_time_ms -= 100.0;
++    if ((int)calc_time_ms < 0)
++      usleep((int)(-calc_time_ms * 1000));
++  }
++
++  // last image is black
++  boblight_setpriority(boblight, 255);
++  boblight_destroy(boblight);
++  close(snapshot_fd);
++  return 0;
++}
++
++/*********************************************************
++ *********************************************************/
++int main(int argc, char *argv[])
++{
++  //load the boblight lib, if it fails we get a char* from dlerror()
++  const char* boblight_error = boblight_loadlibrary(NULL);
++  if (boblight_error)
++  {
++    PrintError(boblight_error);
++    return 1;
++  }
++
++  //try to parse the flags and bitch to stderr if there's an error
++  try {
++    g_flagmanager.ParseFlags(argc, argv);
++  }
++  catch (string error) {
++    PrintError(error);
++    g_flagmanager.PrintHelpMessage();
++    return 1;
++  }
++  
++  if (g_flagmanager.m_printhelp) {
++    g_flagmanager.PrintHelpMessage();
++    return 1;
++  }
++
++  if (g_flagmanager.m_printboblightoptions) {
++    g_flagmanager.PrintBoblightOptions();
++    return 1;
++  }
++  
++  // check if we only should generate a cmdline based
++  // on settings from possible found boblight addon
++  if (g_flagmanager.generateCmdLine)
++  {
++    CBoblightAddonSettings settings;
++    string cmdLine = "-p 100"; //default cmdline just contains priority 100
++
++    if (settings.m_settingsLoaded)
++      cmdLine += " " + settings.getBoblightClientCmdLine();
++    fprintf(stdout, "%s", cmdLine.c_str());
++    return 0;//exit
++  }
++
++  fprintf(stderr, "Using device: %s \n", g_flagmanager.m_device.c_str());
++
++  //set up signal handlers
++  signal(SIGINT,  SignalHandler);
++  signal(SIGTERM, SignalHandler);
++
++  //keep running until we want to quit
++  while(!g_stop) {
++    //init boblight
++    void* boblight = boblight_init();
++
++    fprintf(stdout, "Connecting to boblightd(%p)\n", boblight);
++    
++    //try to connect, if we can't then bitch to stderr and destroy boblight
++    if (!boblight_connect(boblight, g_flagmanager.m_address, g_flagmanager.m_port, 5000000) ||
++        !boblight_setpriority(boblight, 255)) {
++      PrintError(boblight_geterror(boblight));
++      fprintf(stdout, "Waiting 10 seconds before trying again\n");
++      boblight_destroy(boblight);
++      sleep(2);
++      continue;
++    }
++
++    fprintf(stdout, "Connection to boblightd opened\n");
++
++    //try to parse the boblight flags and bitch to stderr if we can't
++    try {
++      g_flagmanager.ParseBoblightOptions(boblight);
++    }
++    catch (string error) {
++      PrintError(error);
++      return 1;
++    }
++
++    try {
++      Run(boblight);
++    }
++    catch (string error) {
++      PrintError(error);
++      boblight_destroy(boblight);
++      return 1;
++    }
++  }
++  fprintf(stdout, "Exiting\n");
++}
+diff -urPp src/clients/flagmanager-aml.cpp src/clients/boblight-aml/flagmanager-aml.cpp
+--- /dev/null	Thu Jan  1 00:00:00 1970
++++ b/src/clients/boblight-aml/flagmanager-aml.cpp	Thu Jan 15 10:21:40 2015
+@@ -0,0 +1,68 @@
++/*
++ * boblight
++ * Copyright (C) Bob  2009 
++ * 
++ * boblight is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ * 
++ * boblight is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++ * See the GNU General Public License for more details.
++ * 
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <iostream>
++
++#include "flagmanager-aml.h"
++#include "util/misc.h"
++#include "config.h"
++
++#define DEFAULT_CAPTURE_DEVICE "/dev/amvideocap0"
++
++using namespace std;
++
++CFlagManagerAML::CFlagManagerAML()
++{
++  // extend the flags -d -> device
++  // -g -> only generate cmdline from possible found boblight addon settings.xml
++  m_flags += "d:g";
++  m_device = DEFAULT_CAPTURE_DEVICE;
++  generateCmdLine = false;
++}
++
++void CFlagManagerAML::ParseFlagsExtended(int& argc, char**& argv, int& c, char*& optarg)
++{
++  if (c == 'd') //devicename
++  {
++    if (optarg) //optional device
++    {
++      m_device = optarg;
++    }
++  }
++  
++  if (c == 'g') //generate cmdline
++  {
++    generateCmdLine = true;
++  }
++}
++
++void CFlagManagerAML::PrintHelpMessage()
++{
++  cout << "Usage: boblight-aml\n";
++  cout << "\n";
++  cout << "  options:\n";
++  cout << "\n";
++  cout << "  -p  priority, from 0 to 255, default is 128\n";
++  cout << "  -s  address[:port], set the address and optional port to connect to\n";
++  cout << "  -o  add libboblight option, syntax: [light:]option=value\n";
++  cout << "  -l  list libboblight options\n";
++  cout << "  -f  fork\n";
++  cout << "  -d  <device> (defaults to " << m_device << ")\n";
++  cout << "  -g  try to find the settings.xml file from boblight addon and return the cmdline to use its options\n";
++  cout << "\n";
++}
+diff -urPp src/clients/flagmanager-aml.h src/clients/boblight-aml/flagmanager-aml.h
+--- /dev/null	Thu Jan  1 00:00:00 1970
++++ b/src/clients/boblight-aml/flagmanager-aml.h	Thu Jan 15 10:20:15 2015
+@@ -0,0 +1,36 @@
++/*
++ * boblight
++ * Copyright (C) Bob  2009 
++ * 
++ * boblight is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ * 
++ * boblight is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++ * See the GNU General Public License for more details.
++ * 
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef FLAGMANAGERAML
++#define FLAGMANAGERAML
++
++#include "clients/flagmanager.h"
++
++class CFlagManagerAML : public CFlagManager
++{
++  public:
++    CFlagManagerAML();
++    void ParseFlagsExtended(int& argc, char**& argv, int& c, char*& optarg);
++
++    void PrintHelpMessage();
++    std::string m_device;           //device to open for amvideocap
++    bool generateCmdLine;
++
++};
++
++#endif //FLAGMANAGERAML
+\ No newline at end of file

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

@@ -35,4 +35,10 @@ if [ -x $ADDON_DIR/bin/boblight-X11 -a -e $ADDON_HOME/boblight.X11 ] ; then
   boblight-X11 -f >/dev/null 2>&1
 fi
 
+if [ -x $ADDON_DIR/bin/boblight-aml -a -e /dev/amvideocap0 ] ; then
+  #generates cmdline from boblight addon settings
+  CMDLINE=`boblight-aml -g`
+  boblight-aml $CMDLINE >/dev/null 2>&1 &
+fi
+
 exec boblightd -c $ADDON_HOME/boblight.conf > $ADDON_LOG_FILE 2>&1

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

@@ -4,7 +4,6 @@ After=graphical.target
 
 [Service]
 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
 RestartSec=10

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

@@ -1,168 +0,0 @@
-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
-
-4.1.1
-- rebuild to fix curl/gnutls/ssl
-
-4.1.0
-- convert to systemd service
-- rebuild for addon api bump
-
-4.0.1
-- rebuild
-
-4.0.0
-- rebuild for OpenELEC-4.0
-
-3.1.4
-- rebuild
-
-3.1.3
-- update to TVHeadend 3.4.27
-
-3.1.2
-- fix unloading multiple modules on suspend
-
-3.1.1
-- rebuild for OpenELEC-3.2
-
-3.0.11
-- improve suspend/resume
-
-3.0.10
-- fix preloading capmt.so with sundtek
-- added the ability to use a script's stdout as the xmltv source instead of a fixed file or URL
-
-3.0.9
-- update to TVHeadend 3.4
-
-3.0.8
-- update to TVHeadend 3.3.521
-
-3.0.7
-- update to TVHeadend 3.3.511
-
-3.0.6
-- update to TVHeadend 3.3.491
-- disable avahi support
-
-3.0.5
-- update to TVHeadend 3.3.485
-
-3.0.4
-- update to TVHeadend 3.3.403
-
-3.0.3
-- update to TVHeadend 3.3.328
-- add an option to preload capmt_ca.so library
-
-3.0.2
-- update to TVHeadend 3.2.18
-
-3.0.1
-- bump addon version
-- add support to install as system addon
-- update to TVHeadend 3.2, rename addon
-- add version string to addon summary
-
-2.1.5
-- add an option to wait for more than 1 adapters to appear
-
-2.1.3
-- update to hts-tvheadend-78213a0
-
-2.1.2
-- add suspend/resume fixes
-- use KILL signal to stop tvheadend
-- add an option to wait for fe initialization
-
-2.1.1
-- update to addon version 2.1
-- update to hts-tvheadend-85e23bb
-
-2.0.8
-- define default recordings folder to /storage/recordings
-- update to hts-tvheadend-a76f365
-- add patch for support IPTV radio streams
-
-2.0.7
-- enable unloading/loading dvb modules on suspend/resume
-- add while loop for restarting tvheadend if it crashes
-
-2.0.6
-- add possibilty to start / stop addon from addon manager with enable / disable
-- add possibility to browse filesystem for xmltv source file
-- start tvheadend in video user group
-- update to hts-tvheadend-b877800
-
-2.0.5
-- start userspace DVB drivers before Tvheadend
-
-2.0.4
-- update to hts-tvheadend-fdf89b2
-
-2.0.3
-- rebuild for libiconv changes
-
-2.0.2
-- update to hts-tvheadend-d66746c
-
-2.0.1
-- fix patches
-
-2.0.0
-- prepare for OpenELEC-2.0 release
-
-1.90.2
-- depends on xbmc.python API 2.0
-
-1.90.1
-- update to hts-tvheadend-fdc743f
-
-1.90.0
-- add (CH) GA Weissenstein default muxes
-- prepare for OpenELEC-1.90 release
-
-1.0.1
-- add XMLTV tv_file_grab support
-- add XMLTV configuration support
-- add teletext support patch
-- add fix memory leak patch
-
-1.0.0
-- prepare for OpenELEC-1.0 release
-
-0.99.8
-- add suspend/wakeup script
-
-0.99.7
-- update to hts-tvheadend-c88a646
-
-0.99.6
-- update to hts-tvheadend-9d775da
-
-0.99.5
-- update to hts-tvheadend-ca68ed4
-
-0.99.4
-- change icon
-
-0.99.3
-- rebuild for openssl downgrade
-
-0.99.2
-- rework start scripts
-
-0.99.1
-- initial version hts-tvheadend-90e3570

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

@@ -1,73 +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="tvheadend"
-PKG_VERSION="3.9.1847"
-PKG_REV="2"
-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_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-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."
-PKG_LONGDESC="Tvheadend (Version: $PKG_VERSION) is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes. If installing as an Addon a reboot is needed"
-PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.service"
-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
-}
-
-configure_target() {
-  ./configure --prefix=/usr \
-            --arch=$TARGET_ARCH \
-            --cpu=$TARGET_CPU \
-            --cc=$TARGET_CC \
-            --enable-hdhomerun_client \
-            --enable-hdhomerun_static \
-            --enable-timeshift \
-            --disable-avahi \
-            --disable-libav \
-            --enable-inotify \
-            --enable-epoll \
-            --disable-uriparser \
-            --enable-tvhcsa \
-            --enable-bundle \
-            --disable-dbus_1 \
-            --python=$ROOT/$TOOLCHAIN/bin/python
-}
-
-post_make_target() {
-  $CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl
-}
-
-makeinstall_target() {
-  : # nothing to do here
-}
-
-addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/.$TARGET_NAME/build.linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/.$TARGET_NAME/capmt_ca.so $ADDON_BUILD/$PKG_ADDON_ID/bin
-}

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

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

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

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

@@ -1,89 +0,0 @@
-#!/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
-
-oe_setup_addon service.multimedia.tvheadend
-
-ADDON_SETTINGS="$ADDON_HOME/settings.xml"
-XMLTV_FILE="$ADDON_DIR/bin/tv_grab_file"
-XMLTV_SETTINGS_DIR="$ADDON_HOME/xmltv"
-XMLTV_SETTINGS_FILE="$XMLTV_SETTINGS_DIR/config"
-DVR_SETTINGS_DIR="$ADDON_HOME/dvr"
-DVR_SETTINGS_FILE="$DVR_SETTINGS_DIR/config"
-DVR_DIR="$HOME/recordings"
-TIMESHIFT_SETTINGS_DIR="$ADDON_HOME/timeshift"
-TIMESHIFT_SETTINGS_FILE="$TIMESHIFT_SETTINGS_DIR/config"
-TIMESHIFT_DIR="$ADDON_HOME/cache/timeshift"
-
-chmod a+x $ADDON_DIR/bin/*
-
-if [ ! -f "$XMLTV_SETTINGS_FILE" ]; then
-  mkdir -p $XMLTV_SETTINGS_DIR
-  if [ -f $ADDON_DIR/xmltv-config ]; then
-    cp $ADDON_DIR/xmltv-config $XMLTV_SETTINGS_FILE
-  fi
-fi
-
-if [ ! -f "$DVR_SETTINGS_FILE" ]; then
-  mkdir -p $DVR_DIR
-  mkdir -p $DVR_SETTINGS_DIR
-  if [ -f $ADDON_DIR/dvr-config ]; then
-    cp $ADDON_DIR/dvr-config $DVR_SETTINGS_FILE
-  fi
-fi
-
-if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then
-  mkdir -p $TIMESHIFT_DIR
-  mkdir -p $TIMESHIFT_SETTINGS_DIR
-  if [ -f $ADDON_DIR/timeshift-config ]; then
-    cp $ADDON_DIR/timeshift-config $TIMESHIFT_SETTINGS_FILE
-  fi
-fi
-
-if [ "$DEBUG" = "yes" ]; then
-  TVHEADEND_ARG="-B -C -s -u root -g video -c $ADDON_HOME"
-else
-  TVHEADEND_ARG="-B -C -u root -g video -c $ADDON_HOME"
-fi
-
-# start userspace DVB driver/addon
-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
-  . $driver_dvb
-done
-
-if [ "$WAIT_FOR_FEINIT" == "true" ] ; then
-  while [ true ] ; do
-    if [ -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend0 ] ; then
-      break
-    fi
-    sleep 1
-  done
-fi
-
-if [ "$PRELOAD_CAPMT_CA" == "true" ] ; then
-  logger -t Tvheadend "### Preloading capmt_ca.so library ###"
-  LD_PRELOAD="$ADDON_DIR/bin/capmt_ca.so $LD_PRELOAD" exec tvheadend $TVHEADEND_ARG &>$ADDON_LOG_FILE
-else
-  exec tvheadend $TVHEADEND_ARG &>$ADDON_LOG_FILE
-fi

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

@@ -1,15 +0,0 @@
-{
-	"storage": "/storage/recordings",
-	"retention-days": 31,
-	"pre-extra-time": 0,
-	"post-extra-time": 0,
-	"day-dir": 0,
-	"channel-dir": 0,
-	"channel-in-title": 0,
-	"date-in-title": 0,
-	"time-in-title": 0,
-	"whitespace-in-title": 0,
-	"title-dir": 0,
-	"episode-in-title": 0,
-	"tag-files": 1
-}

packages/addons/service/multimedia/tvheadend/source/resources/language/English/strings.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<strings>
-
-	<!-- HTS TVHEADEND -->
-	<string id="1000">XMLTV</string>
-	<string id="1001">DVB</string>
-	<string id="1011">XMLTV configuration</string>
-	<string id="1011">XMLTV source type</string>
-	<string id="1012">XMLTV File location</string>
-	<string id="1013">XMLTV Web location</string>
-	<string id="1014">XMLTV Script location</string>
-	<string id="1020">DVB Configuration</string>
-	<string id="1021">Unload DVB mudules before suspend</string>
-	<string id="1022">Wait for frontend initialization</string>
-	<string id="1023">Number of adapters to wait for</string>
-	<string id="1024">Preload capmt_ca.so library</string>
-
-</strings>

packages/addons/service/multimedia/tvheadend/source/resources/settings.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings>
-
-   <!-- HTS TVHEADEND -->
-    <category label="1000">
-		<setting label="1010" type="lsep"/>
-		<setting type="sep" />
-		<setting id="XMLTV_TYPE" type="labelenum" label="1011" values="NONE|FILE|SCRIPT|WEB" sort="yes" default="NONE"/>
-		<setting id="XMLTV_LOCATION_FILE" type="file" label="1012" default="" enable="eq(-1,0)"/>
-		<setting id="XMLTV_LOCATION_WEB" type="text" label="1013" default="http://" enable="eq(-2,3)"/>
-		<setting id="XMLTV_LOCATION_SCRIPT" type="file" label="1014" default="" enable="eq(-3,2)"/>
-    </category>
-    <category label="1001">
-		<setting label="1020" type="lsep"/>
-		<setting type="sep" />
-		<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
-		<setting id="NUM_ADAPTERS" type="slider" range="1,16" option="int" label="1023" default="1" enable="eq(-1,true)" />
-		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
-		<setting id="PRELOAD_CAPMT_CA" type="bool" label="1024" default="false" />
-    </category>
-</settings>

packages/addons/service/multimedia/tvheadend/source/settings-default.xml

@@ -1,8 +0,0 @@
-<settings>
-    <setting id="WAIT_FOR_FEINIT" value="false" />
-    <setting id="NUM_ADAPTERS" value="1" />
-    <setting id="XMLTV_LOCATION_FILE" value="" />
-    <setting id="XMLTV_LOCATION_WEB" value="http://" />
-    <setting id="XMLTV_TYPE" value="NONE" />
-    <setting id="PRELOAD_CAPMT_CA" value="false" />
-</settings>

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

@@ -1,13 +0,0 @@
-[Unit]
-Description=TVHeadend Service
-After=graphical.target
-
-[Service]
-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=kodi.target

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

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

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

@@ -1,14 +0,0 @@
-{
-	"grabbers": [
-		{
-			"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,
-			"capabilities": 1
-		}
-	],
-	"grab-interval": 12,
-	"grab-enabled": 1,
-	"current-grabber": "/storage/.kodi/addons/service.multimedia.tvheadend/bin/tv_grab_file"
-}

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

@@ -1,3 +1,19 @@
+4.3.6
+- update to vdr-satip-1.0.2
+- update to vdr-2.1.7
+
+4.3.5
+- add plugin 'vdr-plugin-restfulapi'
+- update to vdr-plugin-xvdr-b300fc3
+
+4.3.4
+- update to vdr-plugin-vnsiserver-a48edf1
+- update to vdr-plugin-dvbapi-36a6b1d
+
+4.3.3
+- add plugin 'vdr-plugin-epgfixer'
+- update to vdr-satip-1.0.1
+
 4.3.2
 - update to kodi
 

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

@@ -19,12 +19,12 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="4.3"
-PKG_REV="2"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-dummydevice vdr-satip"
+PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-dummydevice vdr-satip vdr-plugin-epgfixer vdr-plugin-restfulapi"
 PKG_PRIORITY="optional"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"
@@ -48,9 +48,11 @@ addon() {
   VDR_PLUGIN_VNSISERVER_DIR="$(get_build_dir vdr-plugin-vnsiserver)"
   VDR_PLUGIN_STREAMVEV_DIR="$(get_build_dir vdr-plugin-streamdev)"
   VDR_PLUGIN_XMLTV2VDR="$(get_build_dir vdr-plugin-xmltv2vdr)"
+  VDR_PLUGIN_EPGFIXER_DIR="$(get_build_dir vdr-plugin-epgfixer)"
+  VDR_PLUGIN_RESTFULAPI_DIR="$(get_build_dir vdr-plugin-restfulapi)"
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
-  cp $VDR_DIR/channels.conf $ADDON_BUILD/$PKG_ADDON_ID/config
+  touch $ADDON_BUILD/$PKG_ADDON_ID/config/channels.conf
   cp $VDR_DIR/diseqc.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $VDR_DIR/keymacros.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $VDR_DIR/scr.conf $ADDON_BUILD/$PKG_ADDON_ID/config
@@ -84,6 +86,8 @@ addon() {
   cp -PR $VDR_PLUGIN_XMLTV2VDR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-dummydevice)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-satip)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $VDR_PLUGIN_EPGFIXER_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $VDR_PLUGIN_RESTFULAPI_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/eepg
 
@@ -103,4 +107,11 @@ addon() {
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
   cp -PR $VDR_PLUGIN_STREAMVEV_DIR/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
+
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer
+  cp -PR $VDR_PLUGIN_EPGFIXER_DIR/epgfixer/*.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer
+
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi
+  cp -P $VDR_PLUGIN_RESTFULAPI_DIR/web/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi
+  cp -P $VDR_PLUGIN_RESTFULAPI_DIR/API.html $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi
 }

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

@@ -45,9 +45,7 @@ ADDON_PLUGIN_DIR="$ADDON_DIR/plugin"
 chmod a+x $ADDON_DIR/bin/*
 
 ADDON_CACHE_DIR="$ADDON_HOME/cache"
-if [ ! -f "$ADDON_CACHE_DIR" ]; then
-  mkdir -p $ADDON_CACHE_DIR
-fi
+mkdir -p $ADDON_CACHE_DIR
 
 VDR_ARG="-g /tmp --no-kbd"
 if [ "$DEBUG" = "yes" ]; then
@@ -105,6 +103,9 @@ fi
 if [ "$ENABLE_EEPG" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P eepg"
 fi
+if [ "$ENABLE_EPGFIXER" == "true" ] ; then
+  VDR_ARG="$VDR_ARG -P epgfixer"
+fi
 if [ "$ENABLE_EPGSEARCH" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P epgsearch"
 fi
@@ -130,6 +131,20 @@ if [ "$ENABLE_XMLTV2VDR" == "true" ] ; then
     cp $source /var/lib/epgsources
   done
 fi
+
+if [ "$ENABLE_RESTFULAPI" == "true" ] ; then
+  RESTFULAPI_ARGS="--ip $RESTFULAPI_IP --port $RESTFULAPI_PORT"
+  if [ ! -z "$RESTFULAPI_EPGIMAGES" ]; then
+    mkdir -p "$RESTFULAPI_EPGIMAGES"
+    RESTFULAPI_ARGS="$RESTFULAPI_ARGS --epgimages=\"$RESTFULAPI_EPGIMAGES\""
+  fi
+  if [ ! -z "$RESTFULAPI_CHANNELLOGOS" ]; then
+    mkdir -p "$RESTFULAPI_CHANNELLOGOS"
+    RESTFULAPI_ARGS="$RESTFULAPI_ARGS --channellogos=\"$RESTFULAPI_CHANNELLOGOS\""
+  fi
+  VDR_ARG="$VDR_ARG -P 'restfulapi $RESTFULAPI_ARGS'"
+fi
+
 # vnsi/xvdr last
 VDR_ARG="$VDR_ARG -P $PVR_PLUGIN"
 

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

@@ -24,10 +24,16 @@
 	<string id="1046">Enable plugin: extended EPG</string>
 	<string id="1047">Enable plugin: dummydevice</string>
 	<string id="1048">Enable plugin: satip</string>
+	<string id="1049">Enable plugin: epgfixer</string>
 	<string id="1051">VDR Configuration</string>
 	<string id="1052">VDR Video Dir</string>
 	<string id="1053">PVR plugin</string>
         <string id="1056">Enable external recdmd</string>
         <string id="1057">External recdmd path</string>
         <string id="1058">- number of devices</string>
+	<string id="1070">Enable plugin: restfulapi</string>
+	<string id="1071">- listen on ip</string>
+	<string id="1072">- listen on port</string>
+	<string id="1073">- Path to the epgimages</string>
+	<string id="1074">- Path to the channellogos</string>
 </strings>

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

@@ -35,6 +35,12 @@
 		<setting id="ENABLE_XMLTV2VDR" type="bool" label="1045" default="false" />
 		<setting id="ENABLE_DUMMYDEVICE" type="bool" label="1047" default="false" />
 		<setting id="ENABLE_SATIP" type="bool" label="1048" default="false" />
+		<setting id="ENABLE_EPGFIXER" type="bool" label="1049" default="false" />
+		<setting id="ENABLE_RESTFULAPI" type="bool" label="1070" default="false" />
+		<setting id="RESTFULAPI_IP" type="ipaddress" label="1071" values="" visible="!eq(-1,false)" default="0.0.0.0"/>
+		<setting id="RESTFULAPI_PORT" type="number" label="1072" values="" visible="!eq(-2,false)"  default="8002"/>
+		<setting id="RESTFULAPI_EPGIMAGES" type="file" label="1073" values="" visible="!eq(-3,false)"  default="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/epgimages"/>
+		<setting id="RESTFULAPI_CHANNELLOGOS" type="file" label="1074" values="" visible="!eq(-4,false)"  default="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/channellogos"/>
 		<setting type="sep" />
 		<setting id="ENABLE_SOFTCAM" type="bool" label="1036" default="true" />
     </category>

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

@@ -14,13 +14,19 @@
     <setting id="ENABLE_CONTROL" value="false" />
     <setting id="CONTROL_PORT" value="2002" />
     <setting id="ENABLE_EEPG" value="false" />
+    <setting id="ENABLE_EPGFIXER" value="false" />
     <setting id="ENABLE_EPGSEARCH" value="false" />
     <setting id="ENABLE_XMLTV2VDR" value="false" />
     <setting id="ENABLE_DUMMYDEVICE" value="false" />
     <setting id="ENABLE_SATIP" value="false" />
     <setting id="ENABLE_EXTERNAL_RECCMD" value="false" />
+    <setting id="ENABLE_RESTFULAPI" value="false" />
     <setting id="EXTERNAL_RECCMD_PATH" value="" />
     <setting id="ENABLE_CHARSET_OVERRIDE" value="false" />
     <setting id="CHARSET_OVERRIDE_STR" value="" />
     <setting id="IPTV_NUM_DEVICES" value="1" />
+    <setting id="RESTFULAPI_IP" value="0.0.0.0" />
+    <setting id="RESTFULAPI_PORT" value="8002" />
+    <setting id="RESTFULAPI_EPGIMAGES" value="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/epgimages" />
+    <setting id="RESTFULAPI_CHANNELLOGOS" value="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/channellogos" />
 </settings>

packages/audio/alsa-lib/patches/alsa-lib-usb-audio-spdif.patch

@@ -0,0 +1,69 @@
+From 01b686cf032d523642c5ab33f455d814ef468925 Mon Sep 17 00:00:00 2001
+From: fritsch <Peter.Fruehberger@gmail.com>
+Date: Sat, 10 Jan 2015 23:47:58 +0100
+Subject: [PATCH] Support PHIREE U2 and Sound blaster F-Xi HD (done by Anssih)
+
+---
+ src/conf/cards/USB-Audio.conf | 41 ++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 40 insertions(+), 1 deletion(-)
+
+diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf
+index ce3ae01..107d6fa 100644
+--- a/src/conf/cards/USB-Audio.conf
++++ b/src/conf/cards/USB-Audio.conf
+@@ -52,6 +52,10 @@ USB-Audio.pcm.iec958_device {
+ 	"USB Device 0x46d:0x992" 999
+ }
+ 
++USB-Audio.pcm.iec958_2_device {
++	"PHIREE U2" 1
++	"USB Sound Blaster HD" 1
++}
+ 
+ # If a device requires non-standard definitions for front, surround40,
+ # surround51, surround71 or iec958, they can be defined here.
+@@ -422,4 +426,39 @@ USB-Audio.pcm.iec958.0 {
+ 	}
+ }
+ 
+-# vim: ft=alsaconf
++USB-Audio.pcm.iec958.1 {
++	@args [ CARD AES0 AES1 AES2 AES3 ]
++	@args.CARD { type string }
++	@args.AES0 { type integer }
++	@args.AES1 { type integer }
++	@args.AES2 { type integer }
++	@args.AES3 { type integer }
++	@func refer
++	name {
++		@func concat
++		strings [
++			"cards.USB-Audio."
++			{ @func card_name card $CARD }
++			".pcm.iec958_2:CARD=" $CARD
++			",AES0=" $AES0 ",AES1=" $AES1 ",AES2=" $AES2 ",AES3=" $AES3
++		]
++	}
++	default {
++		# FIXME: we cannot set the AES parameters
++		type hw
++		card $CARD
++		device {
++			@func refer
++			name {
++				@func concat
++				strings [
++					"cards.USB-Audio.pcm.iec958_2_device."
++					{ @func card_name card $CARD }
++				]
++			}
++			default 999
++		}
++	}
++}
++
++# vim: ft=alsaconf
+\ No newline at end of file
+-- 
+1.9.1
+

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"
@@ -51,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/flac/patches/flac-1.3.1-debug.patch

@@ -0,0 +1,16 @@
+diff -Naur flac-1.3.1/configure.ac flac-1.3.1.patch/configure.ac
+--- flac-1.3.1/configure.ac	2014-11-27 03:45:33.000000000 +0100
++++ flac-1.3.1.patch/configure.ac	2015-01-24 20:19:19.119178172 +0100
+@@ -348,11 +348,10 @@
+ 
+ if test "x$debug" = xtrue; then
+ 	CPPFLAGS="-DDEBUG $CPPFLAGS"
+-	CFLAGS=$(echo "$CFLAGS" | sed 's/-g//')
+ 	CFLAGS="-g $CFLAGS"
+ else
+ 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
+-	CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
++	CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//')
+ 	CFLAGS="-O3 -funroll-loops $CFLAGS"
+ fi
+ 

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/compress/xz/package.mk

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

packages/databases/sqlite/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3080701"
+PKG_VERSION="autoconf-3080801"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"
 PKG_SITE="http://www.sqlite.org/"
-PKG_URL="http://sqlite.org/2014/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://sqlite.org/2015/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="database"

packages/debug/gdb/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gdb"
-PKG_VERSION="7.8.1"
+PKG_VERSION="7.8.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

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/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="automake"
-PKG_VERSION="1.14.1"
+PKG_VERSION="1.15"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/bison/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bison"
-PKG_VERSION="3.0.2"
+PKG_VERSION="3.0.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/boost/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="boost"
-PKG_VERSION="1_56_0"
+PKG_VERSION="1_57_0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/devel/elfutils/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="elfutils"
-PKG_VERSION="0.159"
+PKG_VERSION="0.161"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/elfutils/patches/elfutils-portability.patch

@@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -364,6 +364,10 @@
+@@ -433,6 +433,10 @@
  	* ppc_attrs.c (ppc_check_object_attribute): Handle tag
  	GNU_Power_ABI_Struct_Return.
  
@@ -11,7 +11,7 @@
  2008-10-04  Ulrich Drepper  <drepper@redhat.com>
  
  	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
-@@ -691,6 +695,11 @@
+@@ -760,6 +764,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -23,7 +23,7 @@
  2005-11-19  Roland McGrath  <roland@redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -713,6 +722,9 @@
+@@ -782,6 +791,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -41,7 +41,7 @@
  		-Wl,--version-script,$(@:.so=.map) \
 -		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw)
 +		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw)
- 	$(textrel_check)
+ 	@$(textrel_check)
  
  libebl_i386.so: $(cpu_i386)
 --- elfutils/backends/Makefile.in
@@ -87,18 +87,18 @@
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
  CLEANFILES = *.gcno *.gcda $(foreach m,$(modules), libebl_$(m).map \
  	libebl_$(m).so $(am_libebl_$(m)_pic_a_OBJECTS))
-@@ -885,7 +888,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
+@@ -888,7 +891,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
  	$(LINK) -shared -o $(@:.map=.so) \
  		-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
  		-Wl,--version-script,$(@:.so=.map) \
 -		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw)
 +		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw)
- 	$(textrel_check)
+ 	@$(textrel_check)
  
  libebl_i386.so: $(cpu_i386)
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -148,6 +148,8 @@
+@@ -187,6 +187,8 @@
  
  2012-01-24  Mark Wielaard  <mjw@redhat.com>
  
@@ -107,7 +107,7 @@
  	* COPYING: Fix address. Updated version from gnulib.
  
  2012-01-23  Mark Wielaard  <mjw@redhat.com>
-@@ -166,6 +168,9 @@
+@@ -205,6 +207,9 @@
  
  2011-10-08  Mike Frysinger  <vapier@gentoo.org>
  
@@ -117,7 +117,7 @@
  	* configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly.
  
  2011-10-02  Ulrich Drepper  <drepper@gmail.com>
-@@ -187,6 +192,10 @@
+@@ -226,6 +231,10 @@
  
  	* configure.ac (LOCALEDIR, DATADIRNAME): Removed.
  
@@ -128,7 +128,7 @@
  2009-09-21  Ulrich Drepper  <drepper@redhat.com>
  
  	* configure.ac: Update for more modern autoconf.
-@@ -195,6 +204,10 @@
+@@ -234,6 +243,10 @@
  
  	* configure.ac (zip_LIBS): Check for liblzma too.
  
@@ -139,7 +139,7 @@
  2009-04-19  Roland McGrath  <roland@redhat.com>
  
  	* configure.ac (eu_version): Round down here, not in version.h macros.
-@@ -206,6 +219,8 @@
+@@ -245,6 +258,8 @@
  
  2009-01-23  Roland McGrath  <roland@redhat.com>
  
@@ -148,7 +148,7 @@
  	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
  
  	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -286,6 +301,10 @@
+@@ -325,6 +340,10 @@
  	* configure.ac: Add dummy automake conditional to get dependencies
  	for non-generic linker right.  See src/Makefile.am.
  
@@ -159,7 +159,7 @@
  2005-11-18  Roland McGrath  <roland@redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -333,6 +352,17 @@
+@@ -372,6 +391,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -179,7 +179,7 @@
  	* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
 --- elfutils/config/ChangeLog
 +++ elfutils/config/ChangeLog
-@@ -58,6 +58,10 @@
+@@ -71,6 +71,10 @@
  
  	* known-dwarf.awk: Use gawk.
  
@@ -226,7 +226,7 @@
  %.os: %.c %.o
 --- elfutils/config/Makefile.in
 +++ elfutils/config/Makefile.in
-@@ -146,6 +146,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -147,6 +147,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -234,7 +234,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -177,6 +178,7 @@ SHELL = @SHELL@
+@@ -178,6 +179,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -254,7 +254,7 @@
  /* Define to 1 if you have the <inttypes.h> header file. */
  #undef HAVE_INTTYPES_H
  
-@@ -99,4 +102,7 @@
+@@ -102,4 +105,7 @@
  /* Define for large files, on AIX-style hosts. */
  #undef _LARGE_FILES
  
@@ -264,7 +264,7 @@
  #include <eu-config.h>
 --- elfutils/configure
 +++ elfutils/configure
-@@ -661,6 +661,8 @@ ZLIB_TRUE
+@@ -663,6 +663,8 @@ ZLIB_TRUE
  LIBEBL_SUBDIR
  TESTS_RPATH_FALSE
  TESTS_RPATH_TRUE
@@ -273,7 +273,7 @@
  BUILD_STATIC_FALSE
  BUILD_STATIC_TRUE
  USE_VALGRIND_FALSE
-@@ -676,6 +678,8 @@ NEVER_TRUE
+@@ -678,6 +680,8 @@ NEVER_TRUE
  base_cpu
  NATIVE_LD_FALSE
  NATIVE_LD_TRUE
@@ -282,7 +282,7 @@
  NM
  READELF
  ac_ct_AR
-@@ -796,6 +800,7 @@ enable_debugpred
+@@ -798,6 +802,7 @@ enable_debugpred
  enable_gprof
  enable_gcov
  enable_valgrind
@@ -290,7 +290,7 @@
  enable_tests_rpath
  enable_libebl_subdir
  with_zlib
-@@ -1452,6 +1457,7 @@ Optional Features:
+@@ -1455,6 +1460,7 @@ Optional Features:
    --enable-gprof          build binaries with gprof support
    --enable-gcov           build binaries with gcov support
    --enable-valgrind       run all tests under valgrind
@@ -298,7 +298,7 @@
    --enable-tests-rpath    build $ORIGIN-using rpath into tests
    --enable-libebl-subdir=DIR
                            install libebl_CPU modules in $(libdir)/DIR
-@@ -4674,6 +4680,130 @@ if test "x$ac_cv_c99" != xyes; then :
+@@ -4843,6 +4849,130 @@ if test "x$ac_cv_c99" != xyes; then :
    as_fn_error $? "gcc with C99 support required" "$LINENO" 5
  fi
  
@@ -429,7 +429,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5
  $as_echo_n "checking for __thread support... " >&6; }
  if ${ac_cv_tls+:} false; then :
-@@ -4710,7 +4840,13 @@ fi
+@@ -4879,7 +5009,13 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5
  $as_echo "$ac_cv_tls" >&6; }
  if test "x$ac_cv_tls" != xyes; then :
@@ -444,7 +444,7 @@
  fi
  
  # Check whether --enable-largefile was given.
-@@ -5077,6 +5213,22 @@ else
+@@ -5246,6 +5382,22 @@ else
  fi
  
  
@@ -467,7 +467,7 @@
  # Check whether --enable-tests-rpath was given.
  if test "${enable_tests_rpath+set}" = set; then :
    enableval=$enable_tests_rpath; tests_use_rpath=$enableval
-@@ -5800,7 +5952,7 @@ case "$eu_version" in
+@@ -5983,7 +6135,7 @@ case "$eu_version" in
  esac
  
  # Round up to the next release API (x.y) version.
@@ -476,7 +476,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -6530,6 +6682,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes
+@@ -6729,6 +6881,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes
    as_fn_error $? "conditional \"BUILD_STATIC\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
@@ -568,7 +568,7 @@
  AC_ARG_ENABLE([tests-rpath],
  AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]),
  	       [tests_use_rpath=$enableval], [tests_use_rpath=no])
-@@ -297,7 +353,7 @@ case "$eu_version" in
+@@ -302,7 +358,7 @@ case "$eu_version" in
  esac
  
  # Round up to the next release API (x.y) version.
@@ -660,10 +660,10 @@
 +	$(am__append_1) -fpic
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
  CLEANFILES = *.gcno *.gcda
- textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
+ textrel_msg = echo "WARNING: TEXTREL found in '$@'"
 --- elfutils/libasm/ChangeLog
 +++ elfutils/libasm/ChangeLog
-@@ -79,6 +79,11 @@
+@@ -87,6 +87,11 @@
  	* asm_error.c: Add new error ASM_E_IOERROR.
  	* libasmP.h: Add ASM_E_IOERROR definition.
  
@@ -721,7 +721,7 @@
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
  CLEANFILES = *.gcno *.gcda $(am_libasm_pic_a_OBJECTS) \
  	libasm.so.$(VERSION)
-@@ -370,7 +373,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort
+@@ -373,7 +376,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort
  
  libasm_pic_a_SOURCES = 
  am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os)
@@ -807,7 +807,7 @@
  	$P.mnemonics)
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -420,6 +420,10 @@
+@@ -717,6 +717,10 @@
  
  	* Makefile.am (known-dwarf.h): Run gawk on config/known-dwarf.awk.
  
@@ -818,7 +818,7 @@
  2011-07-14  Mark Wielaard  <mjw@redhat.com>
  
  	* libdw.h (dwarf_offdie): Fix documentation to mention .debug_info.
-@@ -779,6 +783,10 @@
+@@ -1076,6 +1080,10 @@
  
  	* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
  
@@ -829,7 +829,7 @@
  2009-08-10  Roland McGrath  <roland@redhat.com>
  
  	* dwarf_getscopevar.c: Use dwarf_diename.
-@@ -1547,6 +1555,11 @@
+@@ -1844,6 +1852,11 @@
  
  2005-05-31  Roland McGrath  <roland@redhat.com>
  
@@ -860,7 +860,7 @@
  #endif
 --- elfutils/libdw/libdw.h
 +++ elfutils/libdw/libdw.h
-@@ -891,7 +891,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
+@@ -1003,7 +1003,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
  
  
  /* Inline optimizations.  */
@@ -881,7 +881,7 @@
  noinst_PROGRAMS = $(am__EXEEXT_1)
  subdir = libdw
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -295,6 +296,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -298,6 +299,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -889,7 +889,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -326,6 +328,7 @@ SHELL = @SHELL@
+@@ -329,6 +331,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -897,7 +897,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -387,10 +390,11 @@ top_srcdir = @top_srcdir@
+@@ -390,10 +393,11 @@ top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
  AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
  	-I$(srcdir)/../libelf
@@ -911,7 +911,7 @@
 +	$(am__append_1) $(am__append_2)
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
  CLEANFILES = *.gcno *.gcda
- textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
+ textrel_msg = echo "WARNING: TEXTREL found in '$@'"
 --- elfutils/libdwelf/Makefile.in
 +++ elfutils/libdwelf/Makefile.in
 @@ -82,6 +82,7 @@ host_triplet = @host@
@@ -954,10 +954,10 @@
 +	$(am__append_1)
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
  CLEANFILES = *.gcno *.gcda $(am_libdwelf_pic_a_OBJECTS)
- textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
+ textrel_msg = echo "WARNING: TEXTREL found in '$@'"
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -421,6 +421,21 @@
+@@ -571,6 +571,21 @@
  	(dwfl_module_addrsym) (i_to_symfile): New function.
  	(dwfl_module_addrsym) (search_table): Use it.
  
@@ -979,7 +979,7 @@
  2013-11-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
  	    Mark Wielaard  <mjw@redhat.com>
  
-@@ -2186,6 +2201,11 @@
+@@ -2336,6 +2351,11 @@
  
  2005-07-21  Roland McGrath  <roland@redhat.com>
  
@@ -1027,8 +1027,8 @@
 +# endif
 +#endif
  
- #ifndef MIN
- # define MIN(a, b) ((a) < (b) ? (a) : (b))
+ #include "../libdw/memory-access.h"
+ 
 --- elfutils/libdwfl/linux-pid-attach.c
 +++ elfutils/libdwfl/linux-pid-attach.c
 @@ -255,6 +255,11 @@ void
@@ -1107,8 +1107,8 @@
 +	$(am__append_1)
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
  CLEANFILES = *.gcno *.gcda $(am_libdwfl_pic_a_OBJECTS)
- textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
-@@ -410,8 +413,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
+ textrel_msg = echo "WARNING: TEXTREL found in '$@'"
+@@ -413,8 +416,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
  	dwfl_module_register_names.c dwfl_segment_report_module.c \
  	link_map.c core-file.c open.c image-header.c dwfl_frame.c \
  	frame_unwind.c dwfl_frame_pc.c linux-pid-attach.c \
@@ -1121,7 +1121,7 @@
  libelf = ../libelf/libelf.so
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -748,6 +748,11 @@
+@@ -765,6 +765,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -1172,10 +1172,10 @@
 +	$(am__append_1) -fpic
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
  CLEANFILES = *.gcno *.gcda $(am_libebl_pic_a_OBJECTS)
- textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
+ textrel_msg = echo "WARNING: TEXTREL found in '$@'"
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -135,6 +135,11 @@
+@@ -244,6 +244,11 @@
  
  	* elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check.
  
@@ -1187,7 +1187,7 @@
  2011-02-26  Mark Wielaard  <mjw@redhat.com>
  
  	* elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini.
-@@ -812,6 +817,11 @@
+@@ -921,6 +926,11 @@
  
  	* elf.h: Update from glibc.
  
@@ -1285,7 +1285,7 @@
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
  CLEANFILES = *.gcno *.gcda $(am_libelf_pic_a_OBJECTS) \
  	libelf.so.$(VERSION)
-@@ -446,7 +450,7 @@ libelf_a_SOURCES = elf_version.c elf_has
+@@ -449,7 +453,7 @@ libelf_a_SOURCES = elf_version.c elf_has
  
  libelf_pic_a_SOURCES = 
  am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)
@@ -1347,7 +1347,7 @@
  	  break;
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -1112,8 +1112,16 @@
+@@ -1371,8 +1371,16 @@
  	* readelf.c (attr_callback): Use print_block only when we don't use
  	print_ops.
  
@@ -1364,7 +1364,7 @@
  	* ar.c (do_oper_extract): Use pathconf instead of statfs.
  
  2009-08-01  Ulrich Drepper  <drepper@redhat.com>
-@@ -1277,6 +1285,8 @@
+@@ -1536,6 +1544,8 @@
  	* readelf.c (print_debug_frame_section): Use t instead of j formats
  	for ptrdiff_t OFFSET.
  
@@ -1373,7 +1373,7 @@
  2009-01-21  Ulrich Drepper  <drepper@redhat.com>
  
  	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -1460,6 +1470,11 @@
+@@ -1719,6 +1729,11 @@
  	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
  	is valid in RELRO.
  
@@ -1385,7 +1385,7 @@
  2008-02-29  Roland McGrath  <roland@redhat.com>
  
  	* readelf.c (print_attributes): Add a cast.
-@@ -1711,6 +1726,8 @@
+@@ -1970,6 +1985,8 @@
  
  	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
  
@@ -1394,7 +1394,7 @@
  2007-10-15  Roland McGrath  <roland@redhat.com>
  
  	* make-debug-archive.in: New file.
-@@ -2150,6 +2167,10 @@
+@@ -2409,6 +2426,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0@gmx.net>.
  
@@ -1405,7 +1405,7 @@
  2006-08-08  Ulrich Drepper  <drepper@redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -2226,6 +2247,10 @@
+@@ -2485,6 +2506,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -1416,7 +1416,7 @@
  2006-06-12  Ulrich Drepper  <drepper@redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -2574,6 +2599,11 @@
+@@ -2833,6 +2858,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -1430,7 +1430,7 @@
  	* readelf.c (print_debug_line_section): Print section offset of each
 --- elfutils/src/findtextrel.c
 +++ elfutils/src/findtextrel.c
-@@ -496,7 +496,11 @@ ptrcompare (const void *p1, const void *
+@@ -502,7 +502,11 @@ ptrcompare (const void *p1, const void *
  
  
  static void
@@ -1538,7 +1538,7 @@
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
  CLEANFILES = *.gcno *.gcda make-debug-archive none_ld.os \
  	$(ld_modules:.c=.os) *.gconv
-@@ -449,8 +452,8 @@ AM_LFLAGS = -Pld -olex.yy.c
+@@ -452,8 +455,8 @@ AM_LFLAGS = -Pld -olex.yy.c
  native_ld = @native_ld@
  ld_dsos = libld_elf_i386_pic.a
  @NATIVE_LD_FALSE@noinst_LIBRARIES = libld_elf.a libar.a $(ld_dsos) \
@@ -1549,7 +1549,7 @@
  @NATIVE_LD_TRUE@native_ld_cflags = -DBASE_ELF_NAME=elf_$(base_cpu)
  @NEVER_TRUE@libdummy_a_SOURCES = i386_ld.c
  ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \
-@@ -476,13 +479,18 @@ libeu = ../lib/libeu.a
+@@ -479,13 +482,18 @@ libeu = ../lib/libeu.a
  
  # XXX While the file is not finished, don't warn about this
  ldgeneric_no_Wunused = yes
@@ -1571,7 +1571,7 @@
  findtextrel_LDADD = $(libdw) $(libelf)
 --- elfutils/src/readelf.c
 +++ elfutils/src/readelf.c
-@@ -4239,10 +4239,12 @@ listptr_base (struct listptr *p)
+@@ -4368,10 +4368,12 @@ listptr_base (struct listptr *p)
    return base;
  }
  
@@ -1586,7 +1586,7 @@
    struct listptr *p1 = (void *) a;
    struct listptr *p2 = (void *) b;
  
-@@ -4331,8 +4333,11 @@ static void
+@@ -4467,8 +4469,11 @@ static void
  sort_listptr (struct listptr_table *table, const char *name)
  {
    if (table->n > 0)
@@ -1600,7 +1600,7 @@
  }
  
  static bool
-@@ -9252,7 +9257,7 @@ dump_archive_index (Elf *elf, const char
+@@ -9539,7 +9544,7 @@ dump_archive_index (Elf *elf, const char
  	  if (unlikely (elf_rand (elf, as_off) == 0)
  	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
  			   == NULL))
@@ -1682,7 +1682,7 @@
      }
  
    /* Open the file.  */
-@@ -2086,7 +2102,7 @@ while computing checksum for debug infor
+@@ -2091,7 +2107,7 @@ while computing checksum for debug infor
    /* If requested, preserve the timestamp.  */
    if (tvp != NULL)
      {
@@ -1691,7 +1691,7 @@
  	{
  	  error (0, errno, gettext ("\
  cannot set access and modification date of '%s'"),
-@@ -2143,7 +2159,7 @@ handle_ar (int fd, Elf *elf, const char
+@@ -2148,7 +2164,7 @@ handle_ar (int fd, Elf *elf, const char
  
    if (tvp != NULL)
      {
@@ -1712,7 +1712,7 @@
  #ifndef __linux__
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -283,6 +283,13 @@
+@@ -421,6 +421,13 @@
  
  2013-12-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
  
@@ -1726,7 +1726,7 @@
  	* Makefile.am (check_PROGRAMS): Add backtrace, backtrace-child,
  	backtrace-data and backtrace-dwarf.
  	(BUILT_SOURCES, clean-local, backtrace-child-biarch): New.
-@@ -1147,6 +1154,8 @@
+@@ -1285,6 +1292,8 @@
  
  2008-01-21  Roland McGrath  <roland@redhat.com>
  
@@ -1735,7 +1735,7 @@
  	* testfile45.S.bz2: Add tests for cltq, cqto.
  	* testfile45.expect.bz2: Adjust.
  
-@@ -1855,6 +1864,11 @@
+@@ -1993,6 +2002,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -1760,7 +1760,7 @@
  	case 0:
 --- elfutils/tests/Makefile.am
 +++ elfutils/tests/Makefile.am
-@@ -356,6 +356,7 @@ get_lines_LDADD = $(libdw) $(libelf)
+@@ -365,6 +365,7 @@ get_lines_LDADD = $(libdw) $(libelf)
  get_files_LDADD = $(libdw) $(libelf)
  get_aranges_LDADD = $(libdw) $(libelf)
  allfcts_LDADD = $(libdw) $(libelf)
@@ -1788,24 +1788,23 @@
  check_PROGRAMS = arextract$(EXEEXT) arsymtest$(EXEEXT) \
  	newfile$(EXEEXT) saridx$(EXEEXT) scnnames$(EXEEXT) \
  	sectiondump$(EXEEXT) showptable$(EXEEXT) update1$(EXEEXT) \
-@@ -111,7 +112,7 @@ check_PROGRAMS = arextract$(EXEEXT) arsy
- 	backtrace-data$(EXEEXT) backtrace-dwarf$(EXEEXT) \
- 	debuglink$(EXEEXT) debugaltlink$(EXEEXT) buildid$(EXEEXT) \
- 	$(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_4)
+@@ -113,7 +114,7 @@ check_PROGRAMS = arextract$(EXEEXT) arsy
+ 	deleted$(EXEEXT) deleted-lib.so$(EXEEXT) \
+ 	aggregate_size$(EXEEXT) vdsosyms$(EXEEXT) $(am__EXEEXT_1) \
+ 	$(am__EXEEXT_2) $(am__EXEEXT_4)
 -@BIARCH_TRUE@am__append_4 = backtrace-child-biarch
 +@BIARCH_TRUE@am__append_5 = backtrace-child-biarch
  TESTS = run-arextract.sh run-arsymtest.sh newfile$(EXEEXT) \
  	test-nlist$(EXEEXT) update1$(EXEEXT) update2$(EXEEXT) \
  	update3$(EXEEXT) update4$(EXEEXT) run-show-die-info.sh \
-@@ -155,14 +156,14 @@ TESTS = run-arextract.sh run-arsymtest.s
- 	run-backtrace-core-s390.sh run-backtrace-core-aarch64.sh \
- 	run-backtrace-demangle.sh run-stack-d-test.sh \
+@@ -159,14 +160,14 @@ TESTS = run-arextract.sh run-arsymtest.s
  	run-stack-i-test.sh run-readelf-dwz-multi.sh \
--	run-allfcts-multi.sh $(am__EXEEXT_2) $(am__append_7) \
--	$(am__append_8) $(am__EXEEXT_4)
+ 	run-allfcts-multi.sh run-deleted.sh run-linkmap-cut.sh \
+ 	run-aggregate-size.sh vdsosyms$(EXEEXT) run-readelf-A.sh \
+-	$(am__EXEEXT_2) $(am__append_7) $(am__append_8) \
++	$(am__EXEEXT_2) $(am__append_8) $(am__append_9) \
+ 	$(am__EXEEXT_4)
 -@STANDALONE_FALSE@am__append_5 = msg_tst md5-sha1-test
-+	run-allfcts-multi.sh $(am__EXEEXT_2) $(am__append_8) \
-+	$(am__append_9) $(am__EXEEXT_4)
  @STANDALONE_FALSE@am__append_6 = msg_tst md5-sha1-test
 -@LZMA_TRUE@am__append_7 = run-readelf-s.sh run-dwflsyms.sh
 -@ZLIB_TRUE@am__append_8 = run-readelf-zdebug.sh
@@ -1818,7 +1817,7 @@
  subdir = tests
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -768,6 +769,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -787,6 +788,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -1826,7 +1825,7 @@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -799,6 +801,7 @@ SHELL = @SHELL@
+@@ -818,6 +820,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -1834,7 +1833,7 @@
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -858,17 +861,17 @@ top_build_prefix = @top_build_prefix@
+@@ -877,12 +880,12 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
@@ -1852,14 +1851,17 @@
 +	$(am__append_1)
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
  CLEANFILES = *.gcno *.gcda
- textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
+ textrel_msg = echo "WARNING: TEXTREL found in '$@'"
+@@ -890,7 +893,7 @@ textrel_msg = echo "WARNING: TEXTREL fou
+ @FATAL_TEXTREL_TRUE@textrel_found = $(textrel_msg); exit 1
+ textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then $(textrel_found); fi
  BUILD_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf
 -AM_LDFLAGS = $(am__append_2) $(am__append_3)
 +AM_LDFLAGS = $(am__append_3) $(am__append_4)
  @TESTS_RPATH_FALSE@tests_rpath = no
  @TESTS_RPATH_TRUE@tests_rpath = yes
  asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
-@@ -1077,6 +1080,7 @@ get_lines_LDADD = $(libdw) $(libelf)
+@@ -1106,6 +1109,7 @@ get_lines_LDADD = $(libdw) $(libelf)
  get_files_LDADD = $(libdw) $(libelf)
  get_aranges_LDADD = $(libdw) $(libelf)
  allfcts_LDADD = $(libdw) $(libelf)

packages/devel/elfutils/patches/elfutils-really-make-werror-conditional-to-build-werror.patch

@@ -0,0 +1,24 @@
+Really make -Werror conditional to BUILD_WERROR
+
+Otherwise it will fail with an error message like this one:
+
+elf_getarsym.c:290:9: error: 'n' may be used uninitialized in this
+function [-Werror=maybe-uninitialized]
+    arsym[n].as_name = NULL;
+	 ^
+cc1: all warnings being treated as errors
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+diff -rup a/config/eu.am b/config/eu.am
+--- a/config/eu.am	2014-11-10 16:19:14.356031479 +0000
++++ b/config/eu.am	2014-11-10 16:21:11.702072011 +0000
+@@ -35,7 +35,6 @@ LD_AS_NEEDED = @LD_AS_NEEDED@
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'
+ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
+ AM_CFLAGS = -std=gnu99 -Wall -Wshadow \
+-	    $(if $($(*F)_no_Werror),,-Werror) \
+ 	    $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
+ 	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
+ 	    $($(*F)_CFLAGS)

packages/devel/gettext/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gettext"
-PKG_VERSION="0.19.3"
+PKG_VERSION="0.19.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/devel/libpcap/package.mk

@@ -1,53 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-PKG_NAME="libpcap"
-PKG_VERSION="1.6.2"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.tcpdump.org/"
-PKG_URL="http://www.tcpdump.org/release/libpcap-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain libusb libnl"
-PKG_PRIORITY="optional"
-PKG_SECTION="devel"
-PKG_SHORTDESC="system interface for user-level packet capture"
-PKG_LONGDESC="libpcap (Packet CAPture) provides a portable framework for low-level network monitoring. Applications include network statistics collection, security monitoring, network debugging, etc."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
-
-PKG_CONFIGURE_OPTS_TARGET="LIBS=-lpthread \
-                           ac_cv_header_libusb_1_0_libusb_h=no \
-                           --disable-shared \
-                           --with-pcap=linux \
-                           --disable-bluetooth \
-                           --disable-can \
-                           --disable-canusb"
-
-pre_configure_target() {
-# When cross-compiling, configure can't set linux version
-# forcing it
-  sed -i -e 's/ac_cv_linux_vers=unknown/ac_cv_linux_vers=2/' ../configure
-
-  export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/libnl3"
-}
-
-post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
-}

packages/devel/libpcap/patches/libpcap-crosscompiling.patch

@@ -1,11 +0,0 @@
-diff -Naur libpcap-1.6.2/configure.in libpcap-1.6.2.patch/configure.in
---- libpcap-1.6.2/configure.in	2014-07-19 15:21:09.000000000 +0200
-+++ libpcap-1.6.2.patch/configure.in	2014-09-06 05:58:33.918837813 +0200
-@@ -459,7 +459,6 @@
- 			AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
- 			AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
- 			AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
--			V_INCLS="$V_INCLS -I/usr/include/libnl3"
- 			have_any_nl="yes"
- 		])
- 

packages/devel/libtool/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libtool"
-PKG_VERSION="2.4.2"
+PKG_VERSION="2.4.5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -33,4 +33,5 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared"
+PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared HELP2MAN=/bin/true"
+

packages/devel/libtool/patches/libtool-01_dont_relink_against_host.patch

@@ -0,0 +1,13 @@
+diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
+index 5eca4ae..23901ff 100644
+--- a/build-aux/ltmain.sh
++++ b/build-aux/ltmain.sh
+@@ -8333,7 +8333,7 @@ func_mode_link ()
+ 	      fi
+ 	    else
+ 	      # We cannot seem to hardcode it, guess we'll fake it.
+-	      add_dir=-L$libdir
++	      #add_dir=-L$libdir
+ 	      # Try looking first in the location we're being installed to.
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case $libdir in

packages/devel/libtool/patches/libtool-02-use_ld.patch

@@ -0,0 +1,13 @@
+diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
+index 23901ff..df26ab5 100644
+--- a/build-aux/ltmain.sh
++++ b/build-aux/ltmain.sh
+@@ -7250,7 +7250,7 @@ func_mode_link ()
+       # -stdlib=*            select c++ std lib with clang
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+-      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
++      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-fuse-ld=*)
+         func_quote_for_eval "$arg"
+ 	arg=$func_quote_for_eval_result
+         func_append compile_command " $arg"

packages/devel/libtool/patches/libtool-2.4.2-dont_relink_against_host.patch

@@ -1,19 +0,0 @@
-When using sysroot we should append it to libdir which is helpful in cross builds
-as the system is staged in the sysroot. For normal build i.e. when lt_sysroot is not
-set it will still behave same and add -L/usr/lib to relink command
-
--Khem
-
-Index: libtool-2.4/libltdl/config/ltmain.m4sh
-===================================================================
---- libtool-2.4.orig/libltdl/config/ltmain.m4sh
-+++ libtool-2.4/libltdl/config/ltmain.m4sh
-@@ -6122,7 +6122,7 @@ func_mode_link ()
- 	      fi
- 	    else
- 	      # We cannot seem to hardcode it, guess we'll fake it.
--	      add_dir="-L$libdir"
-+	      #add_dir="-L$libdir"
- 	      # Try looking first in the location we're being installed to.
- 	      if test -n "$inst_prefix_dir"; then
- 		case $libdir in

packages/devel/libtool/patches/libtool-2.4.2-no_use_linker_plugin.patch

@@ -1,13 +0,0 @@
-diff -Naur libtool-2.4-old/libltdl/m4/libtool.m4 libtool-2.4-new/libltdl/m4/libtool.m4
---- libtool-2.4-old/libltdl/m4/libtool.m4	2010-09-22 01:41:19.000000000 -0700
-+++ libtool-2.4-new/libltdl/m4/libtool.m4	2010-09-23 20:25:25.000000000 -0700
-@@ -6905,6 +6905,9 @@
- *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
- *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
- esac
-+case "$CC $CFLAGS " in #(
-+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-+esac
- 
- dnl Parse the compiler output and extract the necessary
- dnl objects, libraries and library flags.

packages/devel/libtool/patches/libtool-2.4.2-use_ld.patch

@@ -1,12 +0,0 @@
-diff -Naur libtool-2.4-old/libltdl/config/ltmain.m4sh libtool-2.4-new/libltdl/config/ltmain.m4sh
---- libtool-2.4-old/libltdl/config/ltmain.m4sh	2010-09-22 13:16:41.000000000 -0700
-+++ libtool-2.4-new/libltdl/config/ltmain.m4sh	2010-09-22 13:21:52.000000000 -0700
-@@ -5051,7 +5051,7 @@
-       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fuse-ld=*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"

packages/devel/ncurses/package.mk

@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://www.gnu.org/software/ncurses/"
 PKG_URL="http://ftp.gnu.org/pub/gnu/ncurses/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="toolchain zlib"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="ncurses: The ncurses (new curses) library"

packages/graphics/Mesa/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="Mesa"
-PKG_VERSION="10.3.3"
+PKG_VERSION="10.3.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/graphics/bcm2835-driver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="778b370"
+PKG_VERSION="4a66b50"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/graphics/jasper/patches/jasper-01-fix-CVE-2014-9029.patch

@@ -0,0 +1,36 @@
+Fix CVE-2014-9029
+
+Patch taken from https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2014-9029
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+
+--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c	2014-11-27 12:45:44.000000000 +0100
++++ jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c	2014-11-27 12:44:58.000000000 +0100
+@@ -1281,7 +1281,7 @@ static int jpc_dec_process_coc(jpc_dec_t
+ 	jpc_coc_t *coc = &ms->parms.coc;
+ 	jpc_dec_tile_t *tile;
+ 
+-	if (JAS_CAST(int, coc->compno) > dec->numcomps) {
++	if (JAS_CAST(int, coc->compno) >= dec->numcomps) {
+ 		jas_eprintf("invalid component number in COC marker segment\n");
+ 		return -1;
+ 	}
+@@ -1307,7 +1307,7 @@ static int jpc_dec_process_rgn(jpc_dec_t
+ 	jpc_rgn_t *rgn = &ms->parms.rgn;
+ 	jpc_dec_tile_t *tile;
+ 
+-	if (JAS_CAST(int, rgn->compno) > dec->numcomps) {
++	if (JAS_CAST(int, rgn->compno) >= dec->numcomps) {
+ 		jas_eprintf("invalid component number in RGN marker segment\n");
+ 		return -1;
+ 	}
+@@ -1356,7 +1356,7 @@ static int jpc_dec_process_qcc(jpc_dec_t
+ 	jpc_qcc_t *qcc = &ms->parms.qcc;
+ 	jpc_dec_tile_t *tile;
+ 
+-	if (JAS_CAST(int, qcc->compno) > dec->numcomps) {
++	if (JAS_CAST(int, qcc->compno) >= dec->numcomps) {
+ 		jas_eprintf("invalid component number in QCC marker segment\n");
+ 		return -1;
+ 	}

packages/graphics/libdrm/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libdrm"
-PKG_VERSION="2.4.58"
+PKG_VERSION="2.4.59"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/graphics/libjpeg-turbo/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libjpeg-turbo"
-PKG_VERSION="1.3.0"
+PKG_VERSION="1.4.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/graphics/libpng/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libpng"
-PKG_VERSION="1.6.12"
+PKG_VERSION="1.6.16"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/lang/llvm/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="llvm"
-PKG_VERSION="3.5.0"
+PKG_VERSION="3.5.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux-drivers/bcm_sta/package.mk

@@ -20,7 +20,7 @@
 # http://www.broadcom.com/support/802.11/linux_sta.php
 
 PKG_NAME="bcm_sta"
-PKG_VERSION="6.20.155.1"
+PKG_VERSION="6.30.223.248"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"

packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-002-Makefile.patch

@@ -1,26 +0,0 @@
-diff --git a/x86-32/Makefile b/x86-32/Makefile
-index bf30b03..d835350 100644
---- a/x86-32/Makefile
-+++ b/x86-32/Makefile
-@@ -125,7 +125,7 @@ EXTRA_CFLAGS       += -I$(src)/src/include
- EXTRA_CFLAGS       += -I$(src)/src/wl/sys -I$(src)/src/wl/clm/api -I$(src)/src/wl/phy
- #EXTRA_CFLAGS       += -DBCMDBG_ASSERT
- 
--EXTRA_LDFLAGS      := $(src)/lib/wlc_hybrid.o_shipped
-+EXTRA_LDFLAGS      := $(src)/lib/wlc_hybrid.o_shipped_$(BINARCH)
- 
- KBASE              ?= /lib/modules/`uname -r`
- KBUILD_DIR         ?= $(KBASE)/build
-diff --git a/x86-64/Makefile b/x86-64/Makefile
-index bf30b03..d835350 100644
---- a/x86-64/Makefile
-+++ b/x86-64/Makefile
-@@ -125,7 +125,7 @@ EXTRA_CFLAGS       += -I$(src)/src/include
- EXTRA_CFLAGS       += -I$(src)/src/wl/sys -I$(src)/src/wl/clm/api -I$(src)/src/wl/phy
- #EXTRA_CFLAGS       += -DBCMDBG_ASSERT
- 
--EXTRA_LDFLAGS      := $(src)/lib/wlc_hybrid.o_shipped
-+EXTRA_LDFLAGS      := $(src)/lib/wlc_hybrid.o_shipped_$(BINARCH)
- 
- KBASE              ?= /lib/modules/`uname -r`
- KBUILD_DIR         ?= $(KBASE)/build

packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-003-Make-up-for-missing-init_MUTEX.patch

@@ -1,28 +0,0 @@
---- a/x86-32/src/wl/sys/wl_linux.c
-+++ b/x86-32/src/wl/sys/wl_linux.c
-@@ -99,6 +99,10 @@ static void wl_dpc_rxwork(struct wl_task *task);
-
- #endif
-
-+#ifndef init_MUTEX
-+#define init_MUTEX(sem) sema_init(sem, 1)
-+#endif
-+
- static int wl_linux_watchdog(void *ctx);
- static
- int wl_found = 0;
-
---- a/x86-64/src/wl/sys/wl_linux.c
-+++ b/x86-64/src/wl/sys/wl_linux.c
-@@ -99,6 +99,10 @@ static void wl_dpc_rxwork(struct wl_task *task);
-
- #endif
-
-+#ifndef init_MUTEX
-+#define init_MUTEX(sem) sema_init(sem, 1)
-+#endif
-+
- static int wl_linux_watchdog(void *ctx);
- static
- int wl_found = 0;
-

packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-004-add-support-for-Linux-3.2.0.patch

@@ -1,27 +0,0 @@
---- a/x86-32/src/wl/sys/wl_linux.c
-+++ b/x86-32/src/wl/sys/wl_linux.c
-@@ -385,7 +385,11 @@ static const struct net_device_ops wl_netdev_ops =
- #endif
- 	.ndo_get_stats = wl_get_stats,
- 	.ndo_set_mac_address = wl_set_mac_address,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- 	.ndo_set_multicast_list = wl_set_multicast_list,
-+#else
-+	.ndo_set_rx_mode = wl_set_multicast_list,
-+#endif
- 	.ndo_do_ioctl = wl_ioctl
- };
-
---- a/x86-64/src/wl/sys/wl_linux.c
-+++ b/x86-64/src/wl/sys/wl_linux.c
-@@ -385,7 +385,11 @@ static const struct net_device_ops wl_netdev_ops =
- #endif
- 	.ndo_get_stats = wl_get_stats,
- 	.ndo_set_mac_address = wl_set_mac_address,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
- 	.ndo_set_multicast_list = wl_set_multicast_list,
-+#else
-+	.ndo_set_rx_mode = wl_set_multicast_list,
-+#endif
- 	.ndo_do_ioctl = wl_ioctl
- };

packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-005-add-support-for-linux-3.4.0.patch

@@ -1,25 +0,0 @@
---- a/x86-32/src/wl/sys/wl_linux.c
-+++ b/x86-32/src/wl/sys/wl_linux.c
-@@ -40,7 +40,9 @@
- #include <linux/pci_ids.h>
- #define WLC_MAXBSSCFG		1	
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
- #include <asm/system.h>
-+#endif
- #include <asm/io.h>
- #include <asm/irq.h>
- #include <asm/pgtable.h>
-
---- a/x86-64/src/wl/sys/wl_linux.c
-+++ b/x86-64/src/wl/sys/wl_linux.c
-@@ -40,7 +40,9 @@
- #include <linux/pci_ids.h>
- #define WLC_MAXBSSCFG          1       
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
- #include <asm/system.h>
-+#endif
- #include <asm/io.h>
- #include <asm/irq.h>
- #include <asm/pgtable.h>

packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-006-add-support-for-linux-3.8.0.patch

@@ -1,133 +0,0 @@
---- a/x86-32/src/include/bcmutils.h
-+++ b/x86-32/src/include/bcmutils.h
-@@ -214,7 +214,11 @@ typedef struct bcm_tlv {
- extern int bcm_format_flags(const bcm_bit_desc_t *bd, uint32 flags, char* buf, int len);
- extern int bcm_format_hex(char *str, const void *bytes, int len);
- #endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- extern bcm_tlv_t *BCMROMFN(bcm_parse_tlvs)(void *buf, int buflen, uint key);
-+#else
-+extern bcm_tlv_t *BCMROMFN(bcm_parse_tlvs)(const void *buf, int buflen, uint key);
-+#endif
- 
- typedef uint32 mbool;
-
---- a/x86-32/src/wl/sys/wl_cfg80211.c
-+++ b/x86-32/src/wl/sys/wl_cfg80211.c
-@@ -702,7 +702,11 @@ wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
- 	else
- 		memset(&join_params.params.bssid, 0, ETHER_ADDR_LEN);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- 	wl_ch_to_chanspec(params->channel, &join_params, &join_params_size);
-+#else
-+	wl_ch_to_chanspec(params->chandef.chan, &join_params, &join_params_size);
-+#endif
- 
- 	err = wl_dev_ioctl(dev, WLC_SET_SSID, &join_params, join_params_size);
- 	if (err) {
-@@ -1957,9 +1961,14 @@ static s32 wl_update_bss_info(struct wl_cfg80211_priv *wl)
- 	struct wlc_ssid *ssid;
- 	struct bcm_tlv *tim;
- 	s32 dtim_period;
-+	s32 err = 0;
- 	size_t ie_len;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- 	u8 *ie;
--	s32 err = 0;
-+#else
-+	const u8 *ie;
-+	const struct cfg80211_bss_ies *ies;
-+#endif
- 
- 	ssid = &wl->profile->ssid;
- 	bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
-@@ -1988,8 +1997,22 @@ static s32 wl_update_bss_info(struct wl_cfg80211_priv *wl)
- 		ie_len = bi->ie_length;
- 	} else {
- 		WL_DBG(("Found the AP in the list - BSSID %pM\n", bss->bssid));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- 		ie = bss->information_elements;
- 		ie_len = bss->len_information_elements;
-+#else
-+		rcu_read_lock();
-+		ies = (const struct cfg80211_bss_ies*)rcu_dereference(bss->ies);
-+		if (!ies) {
-+			/* This should never happen */
-+			rcu_read_unlock();
-+			err = -EIO;
-+			goto update_bss_info_out;
-+		}
-+		ie = ies->data;
-+		ie_len = (size_t)(ies->len);
-+		rcu_read_unlock();
-+#endif
- 		cfg80211_put_bss(bss);
- 	}
-
---- a/x86-64/src/include/bcmutils.h
-+++ b/x86-64/src/include/bcmutils.h
-@@ -214,7 +214,11 @@ typedef struct bcm_tlv {
- extern int bcm_format_flags(const bcm_bit_desc_t *bd, uint32 flags, char* buf, int len);
- extern int bcm_format_hex(char *str, const void *bytes, int len);
- #endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- extern bcm_tlv_t *BCMROMFN(bcm_parse_tlvs)(void *buf, int buflen, uint key);
-+#else
-+extern bcm_tlv_t *BCMROMFN(bcm_parse_tlvs)(const void *buf, int buflen, uint key);
-+#endif
- 
- typedef uint32 mbool;
-
---- a/x86-64/src/wl/sys/wl_cfg80211.c
-+++ b/x86-64/src/wl/sys/wl_cfg80211.c
-@@ -702,7 +702,11 @@ wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
- 	else
- 		memset(&join_params.params.bssid, 0, ETHER_ADDR_LEN);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- 	wl_ch_to_chanspec(params->channel, &join_params, &join_params_size);
-+#else
-+	wl_ch_to_chanspec(params->chandef.chan, &join_params, &join_params_size);
-+#endif
- 
- 	err = wl_dev_ioctl(dev, WLC_SET_SSID, &join_params, join_params_size);
- 	if (err) {
-@@ -1957,9 +1961,14 @@ static s32 wl_update_bss_info(struct wl_cfg80211_priv *wl)
- 	struct wlc_ssid *ssid;
- 	struct bcm_tlv *tim;
- 	s32 dtim_period;
-+	s32 err = 0;
- 	size_t ie_len;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- 	u8 *ie;
--	s32 err = 0;
-+#else
-+	const u8 *ie;
-+	const struct cfg80211_bss_ies *ies;
-+#endif
- 
- 	ssid = &wl->profile->ssid;
- 	bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
-@@ -1988,8 +1997,22 @@ static s32 wl_update_bss_info(struct wl_cfg80211_priv *wl)
- 		ie_len = bi->ie_length;
- 	} else {
- 		WL_DBG(("Found the AP in the list - BSSID %pM\n", bss->bssid));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
- 		ie = bss->information_elements;
- 		ie_len = bss->len_information_elements;
-+#else
-+		rcu_read_lock();
-+		ies = (const struct cfg80211_bss_ies*)rcu_dereference(bss->ies);
-+		if (!ies) {
-+			/* This should never happen */
-+			rcu_read_unlock();
-+			err = -EIO;
-+			goto update_bss_info_out;
-+		}
-+		ie = ies->data;
-+		ie_len = (size_t)(ies->len);
-+		rcu_read_unlock();
-+#endif
- 		cfg80211_put_bss(bss);
- 	}

packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-007-add-support-for-linux-3.9.0.patch

@@ -1,35 +0,0 @@
---- a/x86-32/src/wl/sys/wl_cfg80211.c	2013-03-29 18:12:43.447176381 +0100
-+++ b/x86-32/src/wl/sys/wl_cfg80211.c	2013-03-29 18:12:56.595176453 +0100
-@@ -2013,8 +2013,12 @@
- 		ie_len = (size_t)(ies->len);
- 		rcu_read_unlock();
- #endif
--		cfg80211_put_bss(bss);
--	}
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
-+ 		cfg80211_put_bss(bss);
-+#else
-+		cfg80211_put_bss(wl_to_wiphy(wl), bss);
-+#endif
-+ 	}
- 
- 	tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
- 	if (tim) {
-
---- a/x86-64/src/wl/sys/wl_cfg80211.c	2013-03-29 18:12:43.447176381 +0100
-+++ a/x86-64/src/wl/sys/wl_cfg80211.c	2013-03-29 18:12:56.595176453 +0100
-@@ -2013,8 +2013,12 @@
- 		ie_len = (size_t)(ies->len);
- 		rcu_read_unlock();
- #endif
--		cfg80211_put_bss(bss);
--	}
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
-+ 		cfg80211_put_bss(bss);
-+#else
-+		cfg80211_put_bss(wl_to_wiphy(wl), bss);
-+#endif
-+ 	}
- 
- 	tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
- 	if (tim) {

packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-008-nl80211-move-scan-API-to-wdev.patch

@@ -1,64 +0,0 @@
---- a/x86-32/src/wl/sys/wl_cfg80211.c
-+++ b/x86-32/src/wl/sys/wl_cfg80211.c
-@@ -46,7 +46,10 @@ u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO;
- 
- static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
-            enum nl80211_iftype type, u32 *flags, struct vif_params *params);
--static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
-+static s32 wl_cfg80211_scan(struct wiphy *wiphy,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
-+           struct net_device *ndev,
-+#endif
-            struct cfg80211_scan_request *request);
- static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
- static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
-@@ -482,9 +485,15 @@ wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
- }
- 
- static s32
--wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
-+wl_cfg80211_scan(struct wiphy *wiphy,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
-+                 struct net_device *ndev,
-+#endif
-                  struct cfg80211_scan_request *request)
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
-+	struct net_device *ndev = request->wdev->netdev;
-+#endif
- 	struct wl_cfg80211_priv *wl = ndev_to_wl(ndev);
- 	struct cfg80211_ssid *ssids;
- 	struct wl_cfg80211_scan_req *sr = wl_to_sr(wl);
-
---- a/x86-64/src/wl/sys/wl_cfg80211.c
-+++ b/x86-64/src/wl/sys/wl_cfg80211.c
-@@ -46,7 +46,10 @@ u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO;
- 
- static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
-            enum nl80211_iftype type, u32 *flags, struct vif_params *params);
--static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
-+static s32 wl_cfg80211_scan(struct wiphy *wiphy,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
-+           struct net_device *ndev,
-+#endif
-            struct cfg80211_scan_request *request);
- static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
- static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
-@@ -482,9 +485,15 @@ wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,
- }
- 
- static s32
--wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
-+wl_cfg80211_scan(struct wiphy *wiphy,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
-+                 struct net_device *ndev,
-+#endif
-                  struct cfg80211_scan_request *request)
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
-+	struct net_device *ndev = request->wdev->netdev;
-+#endif
- 	struct wl_cfg80211_priv *wl = ndev_to_wl(ndev);
- 	struct cfg80211_ssid *ssids;
- 	struct wl_cfg80211_scan_req *sr = wl_to_sr(wl);
-

packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-009-rename-device.patch

@@ -1,22 +0,0 @@
---- a/x86-32/src/wl/sys/wl_linux.c	2010-12-15 02:58:07.000000000 +0100
-+++ b/x86-32/src/wl/sys/wl_linux.c	2010-12-27 22:14:38.679428984 +0100
-@@ -251,7 +251,7 @@
- #define quote_str(s) to_str(s)
- 
- #ifndef BRCM_WLAN_IFNAME
--#define BRCM_WLAN_IFNAME eth%d
-+#define BRCM_WLAN_IFNAME wlan%d
- #endif
- 
- static char name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME);
---- a/x86-64/src/wl/sys/wl_linux.c	2010-12-15 03:01:09.000000000 +0100
-+++ b/x86-64/src/wl/sys/wl_linux.c	2010-12-27 22:15:18.273865927 +0100
-@@ -251,7 +251,7 @@
- #define quote_str(s) to_str(s)
- 
- #ifndef BRCM_WLAN_IFNAME
--#define BRCM_WLAN_IFNAME eth%d
-+#define BRCM_WLAN_IFNAME wlan%d
- #endif
- 
- static char name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME);

packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-010-add-support-for-linux-3.10.0.patch

@@ -1,228 +0,0 @@
-diff -Naur bcm_sta-6.20.155.1/x86-32/src/wl/sys/wl_linux.c bcm_sta-6.20.155.1.patch/x86-32/src/wl/sys/wl_linux.c
---- bcm_sta-6.20.155.1/x86-32/src/wl/sys/wl_linux.c	2013-04-14 23:10:38.000000000 +0200
-+++ bcm_sta-6.20.155.1.patch/x86-32/src/wl/sys/wl_linux.c	2014-05-14 21:47:59.249976234 +0200
-@@ -2681,7 +2681,7 @@
- void
- wl_tkip_printstats(wl_info_t *wl, bool group_key)
- {
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- 	char debug_buf[512];
- 	int idx;
- 	if (wl->tkipmodops) {
-@@ -2843,6 +2843,7 @@
- 	return 0;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- static int
- wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
- {
-@@ -2897,18 +2898,89 @@
- 	return length;
- }
- 
-+#else
-+
-+static int
-+wl_proc_read(struct seq_file *seq, void *offset)
-+{
-+	wl_info_t * wl = (wl_info_t *)seq->private;
-+	int bcmerror, to_user;
-+
-+	WL_LOCK(wl);
-+	bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL);
-+	WL_UNLOCK(wl);
-+
-+	seq_printf(seq, "%d\n", to_user);
-+	return bcmerror;
-+}
-+
-+static ssize_t wl_proc_write(struct file *file, const char __user *buff,
-+			     size_t length, loff_t *ppos)
-+{
-+	struct seq_file *seq = file->private_data;
-+	wl_info_t * wl = (wl_info_t *)seq->private;
-+	int bcmerror, from_user = 0;
-+
-+	if (length != 1) {
-+		WL_ERROR(("%s: Invalid data length\n", __FUNCTION__));
-+		return -EIO;
-+	}
-+
-+	if (copy_from_user(&from_user, buff, 1)) {
-+		WL_ERROR(("%s: copy from user failed\n", __FUNCTION__));
-+		return -EFAULT;
-+	}
-+
-+	if (from_user >= 0x30)
-+		from_user -= 0x30;
-+
-+	WL_LOCK(wl);
-+	bcmerror = wlc_ioctl(wl->wlc, WLC_SET_MONITOR, &from_user, sizeof(int), NULL);
-+	WL_UNLOCK(wl);
-+
-+	if (bcmerror < 0) {
-+		WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror));
-+		return -EIO;
-+	}
-+	*ppos += length;
-+	return length;
-+}
-+
-+static int wl_proc_open(struct inode *inode, struct file *file)
-+{
-+	return single_open(file, wl_proc_read, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations wl_proc_fops = {
-+	.owner = THIS_MODULE,
-+	.open = wl_proc_open,
-+	.read = seq_read,
-+	.write = wl_proc_write,
-+	.llseek = seq_lseek,
-+	.release = single_release,
-+};
-+#endif
-+
- static int
- wl_reg_proc_entry(wl_info_t *wl)
- {
- 	char tmp[32];
- 	sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);
--	if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
-+	wl->proc_entry = create_proc_entry(tmp, 0644, NULL);
-+	if (wl->proc_entry) {
-+		wl->proc_entry->read_proc = wl_proc_read;
-+		wl->proc_entry->write_proc = wl_proc_write;
-+		wl->proc_entry->data = wl;
-+	}
-+#else
-+	wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_proc_fops, wl);
-+#endif
-+	if (!wl->proc_entry) {
- 		WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
- 		ASSERT(0);
- 		return -1;
- 	}
--	wl->proc_entry->read_proc = wl_proc_read;
--	wl->proc_entry->write_proc = wl_proc_write;
--	wl->proc_entry->data = wl;
- 	return 0;
- }
-diff -Naur bcm_sta-6.20.155.1/x86-64/src/wl/sys/wl_linux.c bcm_sta-6.20.155.1.patch/x86-64/src/wl/sys/wl_linux.c
---- bcm_sta-6.20.155.1/x86-64/src/wl/sys/wl_linux.c	2013-04-14 23:10:38.000000000 +0200
-+++ bcm_sta-6.20.155.1.patch/x86-64/src/wl/sys/wl_linux.c	2014-05-14 21:48:16.002975186 +0200
-@@ -2681,7 +2681,7 @@
- void
- wl_tkip_printstats(wl_info_t *wl, bool group_key)
- {
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- 	char debug_buf[512];
- 	int idx;
- 	if (wl->tkipmodops) {
-@@ -2843,6 +2843,7 @@
- 	return 0;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
- static int
- wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
- {
-@@ -2897,18 +2898,89 @@
- 	return length;
- }
- 
-+#else
-+
-+static int
-+wl_proc_read(struct seq_file *seq, void *offset)
-+{
-+	wl_info_t * wl = (wl_info_t *)seq->private;
-+	int bcmerror, to_user;
-+
-+	WL_LOCK(wl);
-+	bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL);
-+	WL_UNLOCK(wl);
-+
-+	seq_printf(seq, "%d\n", to_user);
-+	return bcmerror;
-+}
-+
-+static ssize_t wl_proc_write(struct file *file, const char __user *buff,
-+			     size_t length, loff_t *ppos)
-+{
-+	struct seq_file *seq = file->private_data;
-+	wl_info_t * wl = (wl_info_t *)seq->private;
-+	int bcmerror, from_user = 0;
-+
-+	if (length != 1) {
-+		WL_ERROR(("%s: Invalid data length\n", __FUNCTION__));
-+		return -EIO;
-+	}
-+
-+	if (copy_from_user(&from_user, buff, 1)) {
-+		WL_ERROR(("%s: copy from user failed\n", __FUNCTION__));
-+		return -EFAULT;
-+	}
-+
-+	if (from_user >= 0x30)
-+		from_user -= 0x30;
-+
-+	WL_LOCK(wl);
-+	bcmerror = wlc_ioctl(wl->wlc, WLC_SET_MONITOR, &from_user, sizeof(int), NULL);
-+	WL_UNLOCK(wl);
-+
-+	if (bcmerror < 0) {
-+		WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror));
-+		return -EIO;
-+	}
-+	*ppos += length;
-+	return length;
-+}
-+
-+static int wl_proc_open(struct inode *inode, struct file *file)
-+{
-+	return single_open(file, wl_proc_read, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations wl_proc_fops = {
-+	.owner = THIS_MODULE,
-+	.open = wl_proc_open,
-+	.read = seq_read,
-+	.write = wl_proc_write,
-+	.llseek = seq_lseek,
-+	.release = single_release,
-+};
-+#endif
-+
- static int
- wl_reg_proc_entry(wl_info_t *wl)
- {
- 	char tmp[32];
- 	sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);
--	if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
-+	wl->proc_entry = create_proc_entry(tmp, 0644, NULL);
-+	if (wl->proc_entry) {
-+		wl->proc_entry->read_proc = wl_proc_read;
-+		wl->proc_entry->write_proc = wl_proc_write;
-+		wl->proc_entry->data = wl;
-+	}
-+#else
-+	wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_proc_fops, wl);
-+#endif
-+	if (!wl->proc_entry) {
- 		WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
- 		ASSERT(0);
- 		return -1;
- 	}
--	wl->proc_entry->read_proc = wl_proc_read;
--	wl->proc_entry->write_proc = wl_proc_write;
--	wl->proc_entry->data = wl;
- 	return 0;
- }

packages/linux-drivers/bcm_sta/patches/6.20.155.1/bcm_sta-011-fix-compile-on-date-time-check.patch

@@ -1,27 +0,0 @@
---- a/x86-32/src/wl/sys/wl_linux.c
-+++ b/x86-32/src/wl/sys/wl_linux.c
-@@ -1773,8 +1773,8 @@
- void
- wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b)
- {
--	bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit,
--		__DATE__, __TIME__, EPI_VERSION_STR);
-+	bcm_bprintf(b, "wl%d: version %s\n", wl->pub->unit,
-+        EPI_VERSION_STR);
- }
- 
- #if defined(BCMDBG)
-
---- a/x86-64/src/wl/sys/wl_linux.c
-+++b/x86-64/src/wl/sys/wl_linux.c
-@@ -1773,8 +1773,8 @@
- void
- wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b)
- {
--	bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit,
--		__DATE__, __TIME__, EPI_VERSION_STR);
-+	bcm_bprintf(b, "wl%d: version %s\n", wl->pub->unit,
-+		EPI_VERSION_STR);
- }
- 
- #if defined(BCMDBG)