Merge pull request #248 from chewitt/settings073

settings: bump to v0.7.3

CHANGELOG

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

CONTRIBUTING.md

@@ -1,20 +1,20 @@
-### Questions about OpenELEC?
+### Questions about LibreELEC?
 
-To get your questions answered, please ask in the OpenELEC [Forum], on IRC: 
-\#openelec on freenode.net, or [webchat]. 
+To get your questions answered, please ask in the LibreELEC [Forum], on IRC: 
+\#libreelec on freenode.net, or [webchat]. 
 
 Do not open an issue.
 
 ### Issue Reports
 
 **BEFORE you report a bug make sure you got the latest testing version of 
-OpenELEC. Your bug might be already fixed.**
+LibreELEC. Your bug might be already fixed.**
 
-If you are at all unsure whether it's a bug in OpenELEC or a problem with 
-something else, post in the OpenELEC [Forum] instead. If it turns out that it is
+If you are at all unsure whether it's a bug in LibreELEC or a problem with 
+something else, post in the LibreELEC [Forum] instead. If it turns out that it is
 a bug, an issue can always be opened later.
 
-If you are sure that it's a bug in OpenELEC and you have not found a [similar issue], open a new [issue]
+If you are sure that it's a bug in LibreELEC and you have not found a [similar issue], open a new [issue]
 and try to answer the following questions:
 - What did you do?
 - What did you expect to happen?
@@ -23,21 +23,21 @@ and try to answer the following questions:
 **It is also importent to provide logs for debugging.
 A zip file can be found in the [logfiles] samba share, this will contain all the logs needed.**
 
-Make sure to specify which version of OpenELEC you are using.
-- OpenELEC version
-- OpenELEC build
-- OpenELEC arch
+Make sure to specify which version of LibreELEC you are using.
+- LibreELEC version
+- LibreELEC build
+- LibreELEC arch
 
 Please don't paste log messages in the issue reports or issue comments - use 
 [sprunge.us](http://sprunge.us) instead.
 
 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.
+particular feature into LibreELEC.
 
 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
+However, LibreELEC 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.
 
@@ -66,11 +66,11 @@ Please follow this process; it's the best way to get your work included in the p
 
 ```bash
    # clone your fork of the repo into the current directory in terminal
-   git clone git@github.com:<your username>/OpenELEC.tv.git
+   git clone git@github.com:<your username>/LibreELEC.tv.git
    # navigate to the newly cloned directory
-   cd OpenELEC.tv
+   cd LibreELEC.tv
    # assign the original repo to a remote called "upstream"
-   git remote add upstream https://github.com/OpenELEC/OpenELEC.tv.git
+   git remote add upstream https://github.com/LibreELEC/LibreELEC.tv.git
    ```
 
 - If you cloned a while ago, get the latest changes from upstream:
@@ -104,8 +104,8 @@ Please follow this process; it's the best way to get your work included in the p
 - [Open a Pull Request](https://help.github.com/articles/using-pull-requests) with a
     clear title and description.
 
-[Forum]: http://openelec.tv/forum
-[issue]: https://github.com/OpenELEC/OpenELEC.tv/issues
-[webchat]: http://openelec.tv/support/chat
-[logfiles]: http://wiki.openelec.tv/index.php?title=OpenELEC_FAQ#Support_Logs
-[similar issue]: https://github.com/OpenELEC/OpenELEC.tv/search?&ref=cmdform&type=Issues
+[Forum]: http://libreelec.tv/forum
+[issue]: https://github.com/LibreELEC/LibreELEC.tv/issues
+[webchat]: http://libreelec.tv/support/chat
+[logfiles]: http://wiki.libreelec.tv/index.php?title=LibreELEC_FAQ#Support_Logs
+[similar issue]: https://github.com/LibreELEC/LibreELEC.tv/search?&ref=cmdform&type=Issues

Makefile

@@ -11,12 +11,12 @@ release:
 image:
 	./scripts/image mkimage
 
-image-efi:
-	./scripts/image mkimage efi
-
 noobs:
 	./scripts/image noobs
 
+amlpkg:
+	./scripts/image amlpkg
+
 clean:
 	rm -rf $(BUILD_DIRS)/* $(BUILD_DIRS)/.stamps
 

README.md

@@ -1,86 +1,19 @@
-[OpenELEC](http://www.openelec.tv)
+# LibreELEC
 
-# OpenELEC - Open Embedded Linux Entertainment Center
+LibreELEC is a 'Just enough OS' Linux distribution for running the award-winning [Kodi](http://kodi.tv) software on popular mediacentre hardware. LibreELEC is a conservative fork of the popular [OpenELEC](http://openelec.tv) project with a stronger focus on pre-release testing and post-release change management. Further information on the project can be found on the [LibreELEC website](https://libreelec.tv).
 
-OpenELEC runs [XBMC](http://xbmc.org), an award-winning free and open source (GPL) software media 
-player and entertainment hub for digital media. For more info see http://xbmc.org .
-The base system has been designed and built from the ground up to be as 
-efficient as possible – consuming only tiny disk and memory footprints and
-providing cutting edge hardware support to deliver a set-top box experience.
+**Issues & Support**
 
-**Source code**
+Please report issues via the [LibreELEC forum: Bug Reports](http://forum.libreelec.tv/forum-35.html). Please ask support questions in the [LibreELEC forum: Help & Support](http://forum.libreelec.tv/forum-3.html) or ask a member of project staff in the #libreelec IRC channel on Freenode.
 
-* https://github.com/OpenELEC/OpenELEC.tv
+**Donations**
 
-**Installation**
-
-* Please read the instructions in our wiki (http://wiki.openelec.tv/index.php?title=Installation) on how to install.
-
-**Known issues**
-
-* Testing snapshot
+Contributions towards current project funding goals can be sent via PayPal to donations@libreelec.tv
 
 **License**
 
-* OpenELEC is released under [GPLv2](http://www.gnu.org/licenses/gpl-2.0.html). Please refer to the "licenses" folder and 
-  source code for clarification on upstream licensing.
+LibreELEC original code is released under [GPLv2](http://www.gnu.org/licenses/gpl-2.0.html).
 
 **Copyright**
 
-* Since OpenELEC includes code from many up stream projects it includes many 
-  copyright owners. OpenELEC makes NO claim of copyright on any upstream code. 
-  However all OpenELEC authored code is copyright openelec.tv.
-  For a complete copyright list checkout the source code to examine the headers.
-  Unless expressly stated otherwise all code submitted DIRECTLY to the OpenELEC 
-  project (in any form) is licensed under [GPLv2](http://www.gnu.org/licenses/gpl-2.0.html) and the Copyright is donated to 
-  openelec.tv.
-  This allows the project to stay manageable in the long term by giving us the
-  freedom to maintain the code as part of the whole without the management 
-  overhead of preserving contact with every submitter ever e.g. move to GPLv3.
-  You are absolutely free to retain copyright. To retain copyright simply add a 
-  copyright header to every submitted code page.
-  If you are submitting code that is not your own work it is the submitters 
-  responsibility to place a header stating the copyright. 
-
-**Features**
-
-* System size ~ 90 - 130MB
-* Minimal hardware requirements
-* Ultra fast boot
-* Optimized builds for platforms such as ION, Intel, Fusion
-* Simple configuration via XBMC itself
-* Plug and Play external storage
-
-**Software**
-
-* XBMC HTPC software – View/Manage all your media.
-* Samba server – File transfer from any PC client
-* SSH server – Remote console access for debugging
-* IR/Bluetooth Remote Control
-
-**Notes**
-
-* SSH login details are user: “root” password: “openelec”.
-  SSH allows command line access to your openelec.tv machine for configuration
-  and file transfer. Linux/Mac clients can natively use SSH, while Windows
-  users might want to try PuTTY for their terminal access.
-* $HOME is mounted on /storage (the second ext4 partition on the drive). 
-  All data transfered to the machine will go here, the rest of the system is
-  read-only with the exception of /var (containing runtime configuration data).
-* Manual update/downgrade procedure is as follows:
-  Extract the snapshot and navigate to the 'target' directory.
-  Copy KERNEL and SYSTEM along with KERNEL.md5 and SYSTEM.md5 to the 'Update' network share (or /storage/.update) on
-  your openelec machine. Your system will automatically upgrade during the 
-  next reboot.
-* Automatic mounting of filesystems is supported. Devices such as USB Flash 
-  sticks can be plugged into a running machine and will be mounted to /media,
-  showing up in xbmc’s GUI.
-* Comments and questions are more than welcome, help is even better and patches 
-  are absolutely perfect!!
-
-**Questions/Support**
-
-* Forums on [http://openelec.tv](http://openelec.tv)
-* IRC chatroom **#openelec** on Freenode
-
-**Happy OpenELEC'ing**
+As LibreELEC includes code from many upstream projects it includes many copyright owners. LibreELEC makes NO claim of copyright on any upstream code. However all original LibreELEC authored code is copyright LibreELEC.tv. For a complete copyright list please checkout the source code to examine license headers. Unless expressly stated otherwise all code submitted to the LibreELEC project (in any form) is licensed under [GPLv2](http://www.gnu.org/licenses/gpl-2.0.html) and copyright is donated to LibreELEC.tv. This approach allows the project to stay manageable in the long term by giving us freedom to maintain the code as part of the whole without the management overhead of preserving contact with every submitter, e.g. GPLv3. You are absolutely free to retain copyright. To retain copyright simply add a copyright header to each submitted code page. If you submit code that is not your own work it is your responsibility to place a header stating the copyright.

TODO

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

config/addon/xbmc.python.module.xml

@@ -4,10 +4,11 @@
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
-    <import addon="os.openelec.tv" version="@OS_VERSION@"/>
+    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
     <import addon="xbmc.python" version="2.1.0"/>
 @REQUIRES@
   </requires>
+  <extension point="xbmc.python.script" library="default.py" />
   <extension point="xbmc.python.module" library="lib/">
   </extension>
   <extension point="xbmc.addon.metadata">

config/addon/xbmc.python.script.xml

@@ -4,12 +4,12 @@
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
-    <import addon="os.openelec.tv" version="@OS_VERSION@"/>
+    <import addon="os.libreelec.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>
+    <provides>@PKG_ADDON_PROVIDES@</provides>
   </extension>
   <extension point="xbmc.addon.metadata">
     <summary>@PKG_SHORTDESC@</summary>

config/addon/xbmc.service.xml

@@ -4,12 +4,12 @@
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
-    <import addon="os.openelec.tv" version="@OS_VERSION@"/>
+    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
     <import addon="xbmc.python" version="2.1.0"/>
 @REQUIRES@
   </requires>
   <extension point="xbmc.service" library="default.py">
-    <provides>executable</provides>
+    <provides>@PKG_ADDON_PROVIDES@</provides>
   </extension>
   <extension point="xbmc.addon.metadata">
     <summary>@PKG_SHORTDESC@</summary>

config/arch.aarch64

@@ -0,0 +1,29 @@
+# determines TARGET_CPU, if not forced by user
+  if [ -z "$TARGET_CPU" ]; then
+    TARGET_CPU=cortex-a53
+  fi
+
+# TARGET_CPU:
+# generic cortex-a35 cortex-a53 cortex-a57 cortex-a72
+# exynos-m1 qdf24xx thunderx xgene1 cortex-a57.cortex-a53
+# cortex-a72.cortex-a53
+
+# determine architecture's family
+  case $TARGET_CPU in
+    generic|cortex-a35|cortex-a53|cortex-a57|cortex-a72|exynos-m1|qdf24xx|thunderx|xgene1|cortex-a57.cortex-a53|cortex-a72.cortex-a53)
+      TARGET_SUBARCH=aarch64
+      TARGET_VARIANT=armv8-a
+      TARGET_ABI=eabi
+      TARGET_CPU_FLAGS="+crc+crypto"
+      TARGET_EXTRA_FLAGS="-mcpu=${TARGET_CPU}${TARGET_CPU_FLAGS}"
+      SIMD_SUPPORT="yes"
+      ;;
+  esac
+
+  TARGET_GCC_ARCH=${TARGET_SUBARCH/-}
+  TARGET_KERNEL_ARCH=arm64
+
+# setup ARCH specific *FLAGS
+  TARGET_CFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mabi=lp64 -Wno-psabi $TARGET_EXTRA_FLAGS"
+  TARGET_LDFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mtune=$TARGET_CPU"
+  GCC_OPTS="--with-abi=lp64 --with-arch=$TARGET_VARIANT"

config/arch.arm

@@ -31,13 +31,10 @@
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
       SIMD_SUPPORT="no"
       ;;
-    cortex-a7|cortex-a15)
-      TARGET_SUBARCH=armv7-a
+    cortex-a7|cortex-a15|cortex-a15.cortex-a7|cortex-a17.cortex-a7)
+      TARGET_SUBARCH=armv7ve
       TARGET_ABI=eabi
-      # It's not currently possible to specify the exact architecture variant (-mcpu)
-      # that A7/A15 supports in the command line so use -mtune here.
-      # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57907
-      TARGET_EXTRA_FLAGS="-mtune=$TARGET_CPU"
+      TARGET_EXTRA_FLAGS="-mcpu=$TARGET_CPU"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
       SIMD_SUPPORT="yes"
       ;;
@@ -50,6 +47,9 @@
       ;;
   esac
 
+  TARGET_GCC_ARCH=${TARGET_SUBARCH/-}
+  TARGET_KERNEL_ARCH=arm
+
 # setup ARCH specific *FLAGS
   TARGET_CFLAGS="-march=$TARGET_SUBARCH -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated $TARGET_EXTRA_FLAGS"
   [ -n "$TARGET_FPU" ] && TARGET_CFLAGS="$TARGET_CFLAGS $TARGET_FPU_FLAGS"

config/arch.i386

@@ -1,14 +0,0 @@
-# determines TARGET_CPU, if not forced by user
-  if [ -z "$TARGET_CPU" ]; then
-    TARGET_CPU=i686
-  fi
-
-# determine architecture's family
-  TARGET_SUBARCH=i686
-
-# setup ARCH specific *FLAGS
-  TARGET_CFLAGS="-march=$TARGET_CPU -m32"
-  TARGET_LDFLAGS="-march=$TARGET_CPU -m32"
-
-# build with SIMD support ( yes / no )
-  SIMD_SUPPORT="yes"

config/arch.x86_64

@@ -6,6 +6,9 @@
 # determine architecture's family
   TARGET_SUBARCH=x86_64
 
+  TARGET_GCC_ARCH=$(echo $TARGET_SUBARCH | sed -e "s,-,,")
+  TARGET_KERNEL_ARCH=x86
+
 # setup ARCH specific *FLAGS
   TARGET_CFLAGS="-march=$TARGET_CPU -m64"
   TARGET_LDFLAGS="-march=$TARGET_CPU -m64"

config/functions

@@ -22,6 +22,11 @@ setup_toolchain() {
     export PKG_CONFIG_LIBDIR="$TARGET_PKG_CONFIG_LIBDIR"
     export PKG_CONFIG_SYSROOT_DIR="$TARGET_PKG_CONFIG_SYSROOT_DIR"
 
+  # set python defaults
+    export _python_sysroot="$SYSROOT_PREFIX"
+    export _python_prefix=/usr
+    export _python_exec_prefix=/usr
+
   # set CMAKE configfile for target
     export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf
 
@@ -55,7 +60,11 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
+  if [ -e $HOME/.libreelec/projects/$PROJECT/packages/linux/package.mk ]; then
+    . $HOME/.libreelec/projects/$PROJECT/packages/linux/package.mk
+  elif [ -e $HOME/.libreelec/packages/linux/package.mk ]; then
+    . $HOME/.libreelec/packages/linux/package.mk
+  elif [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
     . $ROOT/projects/$PROJECT/packages/linux/package.mk
   else
     . $ROOT/packages/linux/package.mk
@@ -65,7 +74,11 @@ kernel_path() {
 }
 
 kernel_version() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
+  if [ -e $HOME/.libreelec/projects/$PROJECT/packages/linux/package.mk ]; then
+    . $HOME/.libreelec/projects/$PROJECT/packages/linux/package.mk
+  elif [ -e $HOME/.libreelec/packages/linux/package.mk ]; then
+    . $HOME/.libreelec/packages/linux/package.mk
+  elif [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
     . $ROOT/projects/$PROJECT/packages/linux/package.mk
   else
     . $ROOT/packages/linux/package.mk
@@ -82,13 +95,23 @@ get_module_dir() {
 # get package's build dir
 get_build_dir() {
   if [ ! -z $1 ] ; then
-    local _PKG_DIR=$(find $ROOT/projects/$PROJECT/packages -name $1 2>/dev/null)
+    local _PKG_DIR=$(find $HOME/.libreelec/projects/$PROJECT/packages -name $1 2>/dev/null)
     if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
       . $_PKG_DIR/package.mk
     else
-      local _PKG_DIR=$(find $ROOT/packages -name $1 2>/dev/null)
+      local _PKG_DIR=$(find $HOME/.libreelec/packages -name $1 2>/dev/null)
       if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
         . $_PKG_DIR/package.mk
+      else
+        local _PKG_DIR=$(find $ROOT/projects/$PROJECT/packages -name $1 2>/dev/null)
+        if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
+          . $_PKG_DIR/package.mk
+        else
+          local _PKG_DIR=$(find $ROOT/packages -name $1 2>/dev/null)
+          if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
+            . $_PKG_DIR/package.mk
+          fi
+        fi
       fi
     fi
 
@@ -224,11 +247,13 @@ enable_service () {
   local target_dir=$INSTALL
 
   [ -f "$target_dir/$unit_dir/$unit" ] || exit 1
-  [ -z "$target" ] && target=`grep '^WantedBy' $target_dir/$unit_dir/$unit | cut -f2 -d=`
-
-  if [ -n "$target" ]; then
-    mkdir -p ${target_dir}/$unit_dir/${target}.wants
-    ln -sf ../${unit} ${target_dir}/$unit_dir/${target}.wants/
+  if [ -z "$target" ] ; then
+    for target in `grep '^WantedBy' $target_dir/$unit_dir/$unit | cut -f2 -d=` ; do
+      if [ -n "$target" ]; then
+        mkdir -p ${target_dir}/$unit_dir/${target}.wants
+        ln -sf ../${unit} ${target_dir}/$unit_dir/${target}.wants/
+      fi
+    done
   fi
 }
 
@@ -248,27 +273,28 @@ dashes="==========================="
 
 check_config() {
 dashes="==========================="
-  if [ ! -d $PROJECT_DIR/$PROJECT ]; then
+  if [ ! -d $PROJECT_DIR/$PROJECT -a ! -d $HOME/.libreelec/projects/$PROJECT ]; then
     check_project="$check_project\n $dashes$dashes$dashes"
     check_project="$check_project\n ERROR: Project not found, use a valid project or create a new config"
     check_project="$check_project\n $dashes$dashes$dashes"
     check_project="$check_project\n\n Valid projects:"
 
-    for projects in $PROJECT_DIR/*; do
+    for projects in $PROJECT_DIR/* $HOME/.libreelec/projects/*; do
       check_project="$check_project\n - $(basename $projects)"
     done
     echo -e $check_project
     exit 1
   fi
 
-  if [ ! -f $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf ]; then
+  if [ ! -f $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -a ! -f $HOME/.libreelec/projects/$PROJECT/linux/linux.$TARGET_ARCH.conf ] &&
+     ! ls $PROJECT_DIR/$PROJECT/linux/*/linux.$TARGET_ARCH.conf &>/dev/null; then
     check_arch="$check_arch\n $dashes$dashes$dashes"
     check_arch="$check_arch\n ERROR: Architecture not found, use a valid Architecture"
     check_arch="$check_arch\n for your project or create a new config"
     check_arch="$check_arch\n $dashes$dashes$dashes"
     check_arch="$check_arch\n\n Valid Architectures for your project: $PROJECT"
 
-    for arch in $PROJECT_DIR/$PROJECT/linux/*.conf; do
+    for arch in $PROJECT_DIR/$PROJECT/linux/*.conf $HOME/.libreelec/projects/$PROJECT/linux/*.conf $PROJECT_DIR/$PROJECT/linux/*/linux.$TARGET_ARCH.conf; do
       check_arch="$check_arch\n - $(basename $arch | cut -f2 -d".")"
     done
     echo -e $check_arch
@@ -282,7 +308,7 @@ show_config() {
 
   dashes="==========================="
   config_message="$config_message\n $dashes$dashes$dashes"
-  config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "unofficial"))"
+  config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community"))"
   config_message="$config_message\n $dashes$dashes$dashes"
 
   # Build options
@@ -307,14 +333,13 @@ show_config() {
   config_message="$config_message\n\n Graphic configuration:"
   config_message="$config_message\n $dashes$dashes"
 
-  config_message="$config_message\n - XORG support:\t\t\t $XORG_SUPPORT"
-  config_message="$config_message\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT"
-  config_message="$config_message\n - XORG Xinerama support:\t\t $XINERAMA_SUPPORT"
-  config_message="$config_message\n - SDL support:\t\t\t\t $SDL_SUPPORT"
+  if [ "$DISPLAYSERVER" = "x11" ] ; then
+    config_message="$config_message\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS"
+    config_message="$config_message\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT"
+    config_message="$config_message\n - WindowManager:\t\t\t $WINDOWMANAGER"
+  fi
   config_message="$config_message\n - OpenGL (GLX) support (provider):\t $OPENGL_SUPPORT ($OPENGL)"
   config_message="$config_message\n - OpenGLES support (provider):\t\t $OPENGLES_SUPPORT ($OPENGLES)"
-  config_message="$config_message\n - WindowManager:\t\t\t $WINDOWMANAGER"
-  config_message="$config_message\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS"
   config_message="$config_message\n - uvesafb support:\t\t\t $UVESAFB_SUPPORT"
 
   # Hardware decoder support
@@ -345,7 +370,6 @@ show_config() {
   config_message="$config_message\n - ALSA support:\t\t\t $ALSA_SUPPORT"
   config_message="$config_message\n - Pulseaudio support:\t\t\t $PULSEAUDIO_SUPPORT"
   config_message="$config_message\n - Bluetooth support:\t\t\t $BLUETOOTH_SUPPORT"
-  config_message="$config_message\n - Hardware Sensors support:\t\t $SENSOR_SUPPORT"
   config_message="$config_message\n - LCD drivers:\t\t\t\t $LCD_DRIVER"
 
   for config_driver in $ADDITIONAL_DRIVERS; do
@@ -370,7 +394,6 @@ show_config() {
   config_message="$config_message\n - SAMBA mounting support:\t\t $SAMBA_SUPPORT"
   config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER"
   config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER"
-  config_message="$config_message\n - PPTP support:\t\t\t $PPTP_SUPPORT"
   config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
 
   # OS configuration
@@ -381,10 +404,10 @@ show_config() {
   config_message="$config_message\n - OEM Support:\t\t\t\t $OEM_SUPPORT"
   config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD"
   config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER"
-if [ "$BOOTLOADER" = "u-boot" ]; then
-  config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG"
-  config_message="$config_message\n - U-Boot config file:\t\t\t $UBOOT_CONFIGFILE"
-fi
+  if [ "$BOOTLOADER" = "u-boot" ]; then
+    config_message="$config_message\n   - U-Boot configuration:\t\t $UBOOT_CONFIG"
+    config_message="$config_message\n   - U-Boot config file:\t\t $UBOOT_CONFIGFILE"
+  fi
   config_message="$config_message\n - UDevil support:\t\t\t $UDEVIL"
   config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
 
@@ -394,9 +417,9 @@ fi
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - Swap Support:\t\t\t $SWAP_SUPPORT"
-if [ "$SWAP_SUPPORT" = "yes" ]; then
-  config_message="$config_message\n - Swapfile default size:\t\t $SWAPFILESIZE"
-fi
+  if [ "$SWAP_SUPPORT" = "yes" ]; then
+    config_message="$config_message\n   - Swapfile default size:\t\t $SWAPFILESIZE"
+  fi
   config_message="$config_message\n - exFAT Support (via Fuse):\t\t $EXFAT"
   config_message="$config_message\n - NTFS Support (via Fuse):\t\t $NTFS3G"
   config_message="$config_message\n - Install HFS Tools:\t\t\t $HFSTOOLS"
@@ -409,8 +432,10 @@ fi
   config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER"
   config_message="$config_message\n - Kodi nonfree support:\t\t $KODI_NONFREE_SUPPORT"
   config_message="$config_message\n - Kodi Blu-Ray support:\t\t $KODI_BLURAY_SUPPORT"
-  config_message="$config_message\n - Bluray BD+ support:\t\t\t $BLURAY_BDPLUS_SUPPORT"
-  config_message="$config_message\n - Bluray AACS support:\t\t\t $BLURAY_AACS_SUPPORT"
+  if [ "$KODI_BLURAY_SUPPORT" = "yes" ] ; then
+    config_message="$config_message\n   - Bluray BD+ support:\t\t $BLURAY_BDPLUS_SUPPORT"
+    config_message="$config_message\n   - Bluray AACS support:\t\t $BLURAY_AACS_SUPPORT"
+  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"
@@ -429,9 +454,6 @@ fi
 
   config_message="$config_message\n - Default Skin:\t\t\t $SKIN_DEFAULT"
   config_message="$config_message\n - Include extra fonts:\t\t\t $KODI_EXTRA_FONTS"
-  config_message="$config_message\n - Include RSXS Screensaver:\t\t $KODI_SCR_RSXS"
-  config_message="$config_message\n - Include ProjectM Visualization:\t $KODI_VIS_PROJECTM"
-  config_message="$config_message\n - Include Goom Visualization:\t\t $KODI_VIS_GOOM"
 
   config_message="$config_message\n"
   config_message="$config_message\n $dashes$dashes$dashes"
@@ -439,5 +461,17 @@ fi
   config_message="$config_message\n $dashes$dashes$dashes"
   config_message="$config_message\n\n\n"
 
-  echo -e $config_message
+  echo -e "$config_message"
 }
+
+# strip
+debug_strip() {
+  if [ ! "$DEBUG" = yes ]; then
+    $STRIP `find $* -type f -executable 2>/dev/null` 2>/dev/null || :
+  fi
+}
+
+# Use distribution functions if any
+if [ -f "distributions/$DISTRO/config/functions" ]; then
+  . distributions/$DISTRO/config/functions
+fi

config/graphic

@@ -1,9 +1,3 @@
-if [ "$DISPLAYSERVER" = "x11" ]; then
-  SDL_SUPPORT="yes"
-else
-  SDL_SUPPORT="no"
-fi
-
 if [ "$OPENGL" = no ]; then
   OPENGL_SUPPORT="no"
 else
@@ -16,26 +10,12 @@ else
   OPENGLES_SUPPORT="yes"
 fi
 
-if [ "$SDL_SUPPORT" = no ]; then
-  JOYSTICK_SUPPORT="no"
-fi
-
-if [ "$OPENGL_SUPPORT" = no ]; then
-  KODI_SCR_RSXS="no"
-  KODI_VIS_PROJECTM="no"
-  KODI_VIS_GOOM="no"
-fi
-
 get_graphicdrivers() {
   if [ "$GRAPHIC_DRIVERS" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia"
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware virtualbox"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do
-    if [ "$drv" = "dove" ]; then
-      XORG_DRIVERS="$XORG_DRIVERS dove"
-    fi
-
     if [ "$drv" = "i915" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i915"
       XORG_DRIVERS="$XORG_DRIVERS intel"
@@ -50,16 +30,6 @@ get_graphicdrivers() {
       VAAPI_SUPPORT="yes"
     fi
 
-    if [ "$drv" = "nouveau" ]; then
-      # DRI_DRIVERS are only used for NV04 - NV20 (which we dont want to support anymore)
-      DRI_DRIVERS="$DRI_DRIVERS"
-      # GALLIUM_DRIVERS are used for all cards from NV30 to nvc0
-      # see also http://nouveau.freedesktop.org/wiki/MesaDrivers/
-      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
-      XORG_DRIVERS="$XORG_DRIVERS nouveau"
-      COMPOSITE_SUPPORT="yes"
-    fi
-
     if [ "$drv" = "nvidia" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia"
       VDPAU_SUPPORT="yes"
@@ -94,11 +64,23 @@ get_graphicdrivers() {
 
     if [ "$drv" = "radeonsi" ]; then
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,radeonsi"
-      XORG_DRIVERS="$XORG_DRIVERS ati"
+      XORG_DRIVERS="$XORG_DRIVERS ati amdgpu"
       LLVM_SUPPORT="yes"
       COMPOSITE_SUPPORT="yes"
       VDPAU_SUPPORT="yes"
     fi
 
+    if [ "$drv" = "virtualbox" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,swrast"
+      XORG_DRIVERS="$XORG_DRIVERS virtualbox"
+    fi
+
+    if [ "$drv" = "vmware" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,swrast"
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga"
+      XORG_DRIVERS="$XORG_DRIVERS vmware"
+#      LLVM_SUPPORT="yes"
+    fi
+
   done
 }

config/noobs/os.json

@@ -1,7 +1,11 @@
 {
-  "name": "@DISTRONAME@",
-  "version": "@OPENELEC_VERSION@",
+  "name": "@DISTRONAME@_@PROJECT@",
+  "version": "@LIBREELEC_VERSION@",
   "release_date": "@RELEASE_DATE@",
   "kernel": "@KERNEL_VERSION@",
-  "description": "@DESCRIPTION@"
+  "description": "@DESCRIPTION@",
+  "username": "root",
+  "password": "@ROOT_PASSWORD@",
+  "supported_models": [@NOOBS_SUPPORTED_MODELS@],
+  "supported_hex_revisions": "@NOOBS_HEX@"
 }

config/noobs/partition_setup.sh

@@ -1,46 +1,44 @@
 #!/bin/sh -x
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2013 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 #
-#  This Program is free software; you can redistribute it and/or modify
+#  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, or (at your option)
-#  any later version.
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
 #
-#  This Program is distributed in the hope that it will be useful,
+#  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
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-MOUNTPOINT="/tmp/OpenELEC-System"
+MOUNTPOINT="/tmp/LibreELEC-System"
 
 md5sumCheck() {
   ( cd $MOUNTPOINT
     echo "checking MD5: $1"
     md5sum -c $1.md5
     if [ "$?" = "1" ]; then
-      echo "######################################################"
-      echo "#                                                    #"
-      echo "# OpenELEC failed md5 check - Installation will quit #"
-      echo "#                                                    #"
-      echo "#    Your original download was probably corrupt.    #"
-      echo "#  Please visit www.openelec.tv and get another copy #"
-      echo "#                                                    #"
-      echo "######################################################"
+      echo "#######################################################"
+      echo "#                                                     #"
+      echo "# LibreELEC failed md5 check - Installation will quit #"
+      echo "#                                                     #"
+      echo "#    Your original download was probably corrupt.     #"
+      echo "#  Please visit www.libreelec.tv and get another copy #"
+      echo "#                                                     #"
+      echo "#######################################################"
       exit 1
     fi
     rm -rf $1.md5
   )
 }
 
-if [ -z $part1 -o -z $part2 -o -z $id1 -o -z $id2]; then
+if [ -z $part1 -o -z $part2 -o -z $id1 -o -z $id2 ]; then
   echo "error: part1, part2, id1 or id2 not specified"
   echo "actual values:"
   echo "part1:" $part1

config/noobs/partitions.json

@@ -1,17 +1,17 @@
 {
   "partitions": [
     {
-      "label":                     "@DISTRONAME@System",
+      "label":                     "@DISTRONAME@_@PROJECT@_System",
       "filesystem_type":           "FAT",
-      "partition_size_nominal":    160,
+      "partition_size_nominal":    @SYSTEM_SIZE@,
       "want_maximised":            false,
       "uncompressed_tarball_size": 120,
       "mkfs_options":              ""
     },
     {
-      "label":                     "@DISTRONAME@Storage",
+      "label":                     "@DISTRONAME@_@PROJECT@_Storage",
       "filesystem_type":           "ext4",
-      "partition_size_nominal":    864,
+      "partition_size_nominal":    512,
       "want_maximised":            true,
       "uncompressed_tarball_size": 10,
       "mkfs_options":              ""

config/optimize

@@ -24,7 +24,7 @@ if [ "$DEBUG" = yes ]; then
 else
   TARGET_CFLAGS="$TARGET_CFLAGS -fomit-frame-pointer"
   TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fomit-frame-pointer"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -s"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS"
 fi
 
 TARGET_CPPFLAGS=

config/options

@@ -2,9 +2,9 @@
   export LC_ALL=C
 
 # determines DISTRO, if not forced by user
-# default is OpenELEC
+# default is LibreELEC
 if [ -z "$DISTRO" ]; then
-  DISTRO="OpenELEC"
+  DISTRO="LibreELEC"
 else
   DISTRO="$DISTRO"
 fi
@@ -17,10 +17,10 @@ else
   PROJECT="$PROJECT"
 fi
 
-# determines TARGET_ARCH, if not forced by user (i386 / x86_64 / arm)
-# default is i386
+# determines TARGET_ARCH, if not forced by user (x86_64 / arm)
+# default is x86_64
 if [ -z "$ARCH" ]; then
-  TARGET_ARCH="i386"
+  TARGET_ARCH="x86_64"
 else
   TARGET_ARCH="$ARCH"
 fi
@@ -52,6 +52,11 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
 # If you have ccache installed, take care that LOCAL_CC don't point to it
   LOCAL_CC=`which gcc`
 
+if [ -z "$LOCAL_CC" ] ; then
+  echo "***** Please install gcc *****"
+  exit 127
+fi
+
 # Need to point to your actual g++
 # If you have ccache installed, take care that LOCAL_CXX don't point to it
   LOCAL_CXX=`which g++`
@@ -76,26 +81,28 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
 # the nearest multiple of 16 kilobytes.
   CCACHE_CACHE_SIZE="30G"
 
-# forcing install of all packages (yes/no)
-  FORCE_INSTALL="no"
-
 # install devtools on development builds
-  if [ "$OPENELEC_VERSION" = "devel" ]; then
+  if [ "$LIBREELEC_VERSION" = "devel" ]; then
     DEVTOOLS=yes
   fi
 
 # read options from $HOME if available
-  if [ -f "$HOME/.openelec/options" ]; then
-    . $HOME/.openelec/options
+  if [ -f "$HOME/.libreelec/options" ]; then
+    . $HOME/.libreelec/options
   fi
-  if [ -f "$HOME/.openelec/$PROJECT/options" ]; then
-    . $HOME/.openelec/$PROJECT/options
+  if [ -f "$HOME/.libreelec/projects/$PROJECT/options" ]; then
+    . $HOME/.libreelec/projects/$PROJECT/options
   fi
 
 # read distro options from $HOME if available
-  if [ -f "$HOME/.openelec/options.$DISTRO" ]; then
-    . $HOME/.openelec/options.$DISTRO
+  if [ -f "$HOME/.libreelec/options.$DISTRO" ]; then
+    . $HOME/.libreelec/options.$DISTRO
   fi
 
+# overwrite OEM_SUPPORT via commandline
+if [ "$OEM" = yes -o "$OEM" = no ]; then
+  OEM_SUPPORT=$OEM
+fi
+
 . config/graphic
 . config/path $1

config/path

@@ -17,9 +17,13 @@ set -e
   fi
 
 HOST_NAME=`$LOCAL_CC -dumpmachine`
-TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI}
+TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI}
+
+BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION
+if [ "$LIBREELEC_VERSION" = "devel" ] ; then
+  BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
+fi
 
-BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION
 if [ -n "$BUILD_SUFFIX" ]; then
   BUILD=$BUILD-$BUILD_SUFFIX
 fi
@@ -36,7 +40,7 @@ SYSROOT_PREFIX=$ROOT/$TOOLCHAIN/$TARGET_NAME/sysroot
 LIB_PREFIX=$SYSROOT_PREFIX/usr
 TARGET_PREFIX=$ROOT/$TOOLCHAIN/bin/$TARGET_NAME-
 
-FAKEROOT_SCRIPT=$ROOT/.fakeroot.$PROJECT.$TARGET_ARCH
+FAKEROOT_SCRIPT=$ROOT/.fakeroot.$BUILD
 
 if [ -z "$INSTALL" ]; then
   INSTALL=$BUILD/image/system
@@ -57,6 +61,8 @@ SED="sed -i"
   PKG_LICENSE="unknown"
   PKG_SITE=""
   PKG_URL=""
+  PKG_SOURCE_NAME=""
+  PKG_SOURCE_DIR=""
   PKG_DEPENDS_TARGET=""
   PKG_DEPENDS_HOST=""
   PKG_DEPENDS_INIT=""
@@ -73,7 +79,41 @@ SED="sed -i"
     _FOUND=0
     PKG_DIR=""
 
-    # first check project folder for a package
+    # check project folder for a package in home dir
+    for DIR in $(find $HOME/.libreelec/projects/$PROJECT/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do
+      if [ -r "$DIR/package.mk" ]; then
+        # found first, set $PKG_DIR
+        PKG_DIR="$DIR"
+        # keep track of dirs with package.mk for detecting multiple folders
+        _ALL_DIRS="${_ALL_DIRS}${DIR}\\n"
+        _FOUND=$((_FOUND+1))
+        if [ $_FOUND -gt 1 ]; then
+          # _FOUND more ? fail
+          echo "Error - multiple package folders:"
+          echo -e "$_ALL_DIRS"
+          exit 1
+        fi
+      fi
+    done
+
+    # check for a package in home dir if not found already
+    for DIR in $(find $HOME/.libreelec/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do
+      if [ -r "$DIR/package.mk" ]; then
+        # found first, set $PKG_DIR
+        PKG_DIR="$DIR"
+        # keep track of dirs with package.mk for detecting multiple folders
+        _ALL_DIRS="${_ALL_DIRS}${DIR}\\n"
+        _FOUND=$((_FOUND+1))
+        if [ $_FOUND -gt 1 ]; then
+          # _FOUND more ? fail
+          echo "Error - multiple package folders:"
+          echo -e "$_ALL_DIRS"
+          exit 1
+        fi
+      fi
+    done
+
+    # check project folder for a package if not found already
     for DIR in $(find $ROOT/projects/$PROJECT/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do
       if [ -r "$DIR/package.mk" ]; then
         # found first, set $PKG_DIR
@@ -118,6 +158,38 @@ SED="sed -i"
     [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
   fi
 
+  # Automatically set PKG_SOURCE_NAME unless it is already defined.
+  # PKG_SOURCE_NAME will be automatically set to a name based on
+  # the $PKG_NAME-$PKG_VERSION convention.
+  #
+  # Any $PKG_URL that references more than a single url will abort
+  # the build as these are no longer supported - use mkpkg instead.
+  if [ -n "$PKG_URL" -a -z "$PKG_SOURCE_NAME" ]; then
+    if [[ $PKG_URL =~ .*\ .* ]]; then
+      echo "Error - packages with multiple urls are no longer supported, use mkpkg:"
+      echo "$PKG_URL"
+      exit 1
+    fi
+    PKG_SOURCE_NAME="$(basename "$PKG_URL")"
+    case $PKG_SOURCE_NAME in
+      ${PKG_NAME}-${PKG_VERSION}.*)
+        PKG_SOURCE_NAME=$PKG_SOURCE_NAME
+        ;;
+      *.tar | *.tbz | *.tgz | *.txz | *.7z | *.zip)
+        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.${PKG_SOURCE_NAME##*\.}
+        ;;
+      *.tar.bz2 | *.tar.gz | *.tar.xz)
+        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.tar.${PKG_SOURCE_NAME##*\.}
+        ;;
+       *.diff | *.patch | *.diff.bz2 | *.patch.bz2 | patch-*.bz2 | *.diff.gz | *.patch.gz | patch-*.gz)
+        PKG_SOURCE_NAME=$PKG_SOURCE_NAME
+        ;;
+      *)
+        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.${PKG_SOURCE_NAME##*\.}
+        ;;
+    esac
+  fi
+
   PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
 
 XORG_PATH_DRI=/usr/lib/dri
@@ -127,8 +199,6 @@ XORG_PATH_RGB=/usr/lib/X11/rgb
 XORG_PATH_MODULES=/usr/lib/xorg/modules
 XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 
-SSL_CERTIFICATES="/etc/pki/tls"
-
 TOOLCHAIN_LANGUAGES=c
 [ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++
 
@@ -169,7 +239,7 @@ HOST_PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pk
 HOST_PKG_CONFIG_SYSROOT_DIR=""
 
 if [ -z "$CCACHE_DIR" ]; then
-    export CCACHE_DIR=$HOME/.ccache-openelec
+    export CCACHE_DIR=$HOME/.ccache-libreelec
 fi
 export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL
 export PKG_CONFIG=$ROOT/$TOOLCHAIN/bin/pkg-config

config/release/Autorun.inf

@@ -1,2 +0,0 @@
-[autorun]
-icon=openelec.ico

config/version

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

distributions/LibreELEC/options

@@ -1,18 +1,21 @@
 # Name of the Distro to build (full name, without special characters)
-  DISTRONAME="OpenELEC"
+  DISTRONAME="LibreELEC"
 
 # short project description
-  DESCRIPTION="OpenELEC is a fast and userfriendly Kodi Entertainment Center distribution."
+  DESCRIPTION="LibreELEC is a fast and user-friendly Kodi Entertainment Center distribution."
 
 # Welcome Message for e.g. SSH Server (up to 5 Lines)
   GREETING0="##############################################"
-  GREETING1="# OpenELEC - The living room PC for everyone #"
-  GREETING2="# ...... visit http://www.openelec.tv ...... #"
+  GREETING1="#                 LibreELEC                  #"
+  GREETING2="#            http://libreelec.tv             #"
   GREETING3="##############################################"
   GREETING4=""
 
 # Root password to integrate in the target system
-  ROOT_PASSWORD="openelec"
+  ROOT_PASSWORD="libreelec"
+
+# Install glibc locales to the build (yes / no)
+  GLIBC_LOCALES="yes"
 
 # Mediacenter to use (kodi / no)
   MEDIACENTER="kodi"
@@ -28,27 +31,8 @@
 # install extra subtitle Fonts for KODI (yes / no)
   KODI_EXTRA_FONTS="yes"
 
-# build and install 'RSXS' Screensaver (yes / no)
-  KODI_SCR_RSXS="yes"
-
-# build and install 'ProjectM' Visualization (yes / no)
-  KODI_VIS_PROJECTM="yes"
-
-# build and install 'GOOM' Visualization (yes / no)
-  KODI_VIS_GOOM="yes"
-
-# build and install 'Waveform' Visualization (yes / no)
-  KODI_VIS_WAVEFORM="yes"
-
-# build and install 'Spectrum' Visualization (yes / no)
-  KODI_VIS_SPECTRUM="yes"
-
-# build and install 'FishBMC' Visualization (yes / no)
-  # does not work on RPi
-  KODI_VIS_FISHBMC="yes"
-
 # build and install PulseAudio support (yes / no)
-  PULSEAUDIO_SUPPORT="no"
+  PULSEAUDIO_SUPPORT="yes"
 
 # build and install espeak support (yes / no)
   ESPEAK_SUPPORT="yes"
@@ -76,7 +60,7 @@
 # for a list of additinoal drivers see packages/linux-drivers
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8188EU RTL8812AU dvbhdhomerun"
+  ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8192EU RTL8188EU RTL8812AU dvbhdhomerun"
 
 # build and install bluetooth support (yes / no)
   BLUETOOTH_SUPPORT="yes"
@@ -99,11 +83,6 @@
 # build xbmc with optical drive support (yes / no)
   KODI_OPTICAL_SUPPORT="yes"
 
-# KODI Audio encoders for usage with optical drive support
-# Space separated list is supported,
-# e.g. KODI_AUDIOENCODER_ADDONS="ENCODER1 ENCODER2"
-  KODI_AUDIOENCODER_ADDONS="flac lame vorbis wav"
-
 # build with AirPlay support (stream videos from iDevices to KODI) (yes / no)
   KODI_AIRPLAY_SUPPORT="yes"
 
@@ -128,9 +107,6 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
-# build and install PPP support (yes / no)
-  PPTP_SUPPORT="yes"
-
 # build and install OpenVPN support (yes / no)
   OPENVPN_SUPPORT="yes"
 
@@ -151,16 +127,10 @@
 # Windowmanager to use (ratpoison / fluxbox / none)
   WINDOWMANAGER="fluxbox"
 
-# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau)
+# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
 # Space separated list is supported,
-# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia nouveau"
-  if [ "$TARGET_ARCH" = "i386" ]; then
-    # TODO: create Legacy build with OpenELEC-4.2
-    # install legacy drivers to i386 ARCH
-    GRAPHIC_DRIVERS="r200 r300 r600 i915 i965 nvidia-legacy"
-  elif [ "$TARGET_ARCH" = "x86_64" ]; then
-    GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia"
-  fi
+# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
+  GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia nvidia-legacy"
 
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="yes"
@@ -182,7 +152,7 @@
 
 # LCD driver to Use - Possible drivers are ( Comma seperated:
 # bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,dm140,
-# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
+# ea65,EyeboxOne,g15,glcd,glcdlib,glk,hd44780,i2500vfd,
 # icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,
 # joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,
 # ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,
@@ -221,16 +191,18 @@
 # cron support (yes / no)
   CRON_SUPPORT="yes"
 
-# Perf support in development builds (yes / no)
-  PERF_SUPPORT="yes"
-
 # Distribution Specific source location
-  DISTRO_MIRROR="http://sources.openelec.tv/mirror"
-  DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
+  DISTRO_MIRROR="http://sources.libreelec.tv/mirror"
+  DISTRO_SRC="http://sources.libreelec.tv/$LIBREELEC_VERSION"
 
 # Addon Server Url
-  ADDON_SERVER_URL="http://addons.openelec.tv"
+  ADDON_SERVER_URL="http://addons.libreelec.tv"
 
 # set the addon dirs
   ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
   ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"
+
+# Default size of system partition, in MB, eg. 512
+  SYSTEM_SIZE=512
+# Default system partition offset, in sectors, eg. 2048
+  SYSTEM_PART_START=2048

packages/addons/addon-depends/RPi.GPIO/package.mk

@@ -0,0 +1,45 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="RPi.GPIO"
+PKG_VERSION="0.6.2"
+PKG_REV="1"
+PKG_ARCH="arm"
+PKG_LICENSE="MIT"
+PKG_SITE="http://sourceforge.net/p/raspberry-gpio-python/"
+PKG_URL="https://pypi.python.org/packages/source/R/RPi.GPIO/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python distutilscross:host"
+PKG_PRIORITY="optional"
+PKG_SECTION="python"
+PKG_SHORTDESC="A module to control Raspberry Pi GPIO channels"
+PKG_LONGDESC="A module to control Raspberry Pi GPIO channels"
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
+  export LDSHARED="$CC -shared"
+  export CPPFLAGS="$TARGET_CPPFLAGS -I${SYSROOT_PREFIX}/usr/include/python2.7"
+}
+
+make_target() {
+  python setup.py build
+}
+
+makeinstall_target() {
+  : # nop
+}

packages/addons/addon-depends/atk/package.mk

@@ -18,40 +18,25 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="repository.unofficial.addon.pro"
-PKG_VERSION="4.3"
-PKG_REV="4"
+PKG_NAME="atk"
+PKG_VERSION="2.20.0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://unofficial.addon.pro"
-PKG_URL=""
-PKG_DEPENDS_TARGET=""
+PKG_SITE="http://library.gnome.org/devel/atk/"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/$PKG_NAME/2.20/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain glib"
 PKG_PRIORITY="optional"
-PKG_SECTION=""
-PKG_SHORTDESC="Unfficial OpenELEC.tv Add-on Repository"
-PKG_LONGDESC="Unfficial OpenELEC.tv Add-on Repository"
+PKG_SECTION="accessibility"
+PKG_SHORTDESC="ATK - Accessibility Toolkit"
+PKG_LONGDESC="ATK provides the set of accessibility interfaces that are implemented by other toolkits and applications. Using the ATK interfaces, accessibility tools have full access to view and control running applications."
+PKG_IS_ADDON="no"
 
-PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.addon.repository"
+PKG_AUTORECONF="yes"
 
-PKG_AUTORECONF="no"
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
+                           --disable-rebuilds --disable-glibtest"
 
-PKG_MAINTAINER="unofficial.addon.pro"
-
-make_target() {
-  $SED -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \
-     -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
-}
-
-makeinstall_target() {
-  : # nop
-}
-
-addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-  cp -R $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
 }

packages/addons/addon-depends/atk/patches/atk-meh.patch

@@ -0,0 +1,347 @@
+diff -Naur atk-2.20.0/atk/atkobject.c atk-2.20.0.patch/atk/atkobject.c
+--- atk-2.20.0/atk/atkobject.c	2016-02-15 12:29:12.000000000 +0100
++++ atk-2.20.0.patch/atk/atkobject.c	2016-03-26 01:10:01.058238623 +0100
+@@ -26,7 +26,6 @@
+ #include <glib/gi18n-lib.h>
+ 
+ #include "atk.h"
+-#include "atkmarshal.h"
+ #include "atkprivate.h"
+ 
+ /**
+@@ -610,27 +609,6 @@
+                   G_TYPE_POINTER);
+ 
+   /**
+-   * AtkObject::state-change:
+-   * @atkobject: the object which received the signal.
+-   * @arg1: The name of the state which has changed
+-   * @arg2: A boolean which indicates whether the state has been set or unset.
+-   *
+-   * The "state-change" signal is emitted when an object's state
+-   * changes.  The detail value identifies the state type which has
+-   * changed.
+-   */
+-  atk_object_signals[STATE_CHANGE] =
+-    g_signal_new ("state_change",
+-                  G_TYPE_FROM_CLASS (klass),
+-                  G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
+-                  G_STRUCT_OFFSET (AtkObjectClass, state_change),
+-                  (GSignalAccumulator) NULL, NULL,
+-                  atk_marshal_VOID__STRING_BOOLEAN,
+-                  G_TYPE_NONE, 2,
+-                  G_TYPE_STRING,
+-                  G_TYPE_BOOLEAN);
+-
+-  /**
+    * AtkObject::visible-data-changed:
+    * @atkobject: the object which received the signal.
+    *
+diff -Naur atk-2.20.0/atk/atktable.c atk-2.20.0.patch/atk/atktable.c
+--- atk-2.20.0/atk/atktable.c	2016-02-15 12:29:12.000000000 +0100
++++ atk-2.20.0.patch/atk/atktable.c	2016-03-26 01:11:35.242363570 +0100
+@@ -20,7 +20,6 @@
+ #include "config.h"
+ 
+ #include "atktable.h"
+-#include "atkmarshal.h"
+ 
+ /**
+  * SECTION:atktable
+@@ -102,78 +101,6 @@
+   if (!initialized)
+     {
+       /**
+-       * AtkTable::row-inserted:
+-       * @atktable: the object which received the signal.
+-       * @arg1: The index of the first row inserted.
+-       * @arg2: The number of rows inserted.
+-       *
+-       * The "row-inserted" signal is emitted by an object which
+-       * implements the AtkTable interface when a row is inserted.
+-       */
+-      atk_table_signals[ROW_INSERTED] =
+-	g_signal_new ("row_inserted",
+-		      ATK_TYPE_TABLE,
+-		      G_SIGNAL_RUN_LAST,
+-		      G_STRUCT_OFFSET (AtkTableIface, row_inserted),
+-		      (GSignalAccumulator) NULL, NULL,
+-		      atk_marshal_VOID__INT_INT,
+-		      G_TYPE_NONE,
+-		      2, G_TYPE_INT, G_TYPE_INT);
+-      /**
+-       * AtkTable::column-inserted:
+-       * @atktable: the object which received the signal.
+-       * @arg1: The index of the column inserted.
+-       * @arg2: The number of colums inserted.
+-       *
+-       * The "column-inserted" signal is emitted by an object which
+-       * implements the AtkTable interface when a column is inserted.
+-       */
+-      atk_table_signals[COLUMN_INSERTED] =
+-	g_signal_new ("column_inserted",
+-		      ATK_TYPE_TABLE,
+-		      G_SIGNAL_RUN_LAST,
+-		      G_STRUCT_OFFSET (AtkTableIface, column_inserted),
+-		      (GSignalAccumulator) NULL, NULL,
+-		      atk_marshal_VOID__INT_INT,
+-		      G_TYPE_NONE,
+-		      2, G_TYPE_INT, G_TYPE_INT);
+-      /**
+-       * AtkTable::row-deleted:
+-       * @atktable: the object which received the signal.
+-       * @arg1: The index of the first row deleted.
+-       * @arg2: The number of rows deleted.
+-       *
+-       * The "row-deleted" signal is emitted by an object which
+-       * implements the AtkTable interface when a row is deleted.
+-       */
+-      atk_table_signals[ROW_DELETED] =
+-	g_signal_new ("row_deleted",
+-		      ATK_TYPE_TABLE,
+-		      G_SIGNAL_RUN_LAST,
+-		      G_STRUCT_OFFSET (AtkTableIface, row_deleted),
+-		      (GSignalAccumulator) NULL, NULL,
+-		      atk_marshal_VOID__INT_INT,
+-		      G_TYPE_NONE,
+-		      2, G_TYPE_INT, G_TYPE_INT);
+-      /**
+-       * AtkTable::column-deleted:
+-       * @atktable: the object which received the signal.
+-       * @arg1: The index of the first column deleted.
+-       * @arg2: The number of columns deleted.
+-       *
+-       * The "column-deleted" signal is emitted by an object which
+-       * implements the AtkTable interface when a column is deleted.
+-       */
+-      atk_table_signals[COLUMN_DELETED] =
+-	g_signal_new ("column_deleted",
+-		      ATK_TYPE_TABLE,
+-		      G_SIGNAL_RUN_LAST,
+-		      G_STRUCT_OFFSET (AtkTableIface, column_deleted),
+-		      (GSignalAccumulator) NULL, NULL,
+-		      atk_marshal_VOID__INT_INT,
+-		      G_TYPE_NONE,
+-		      2, G_TYPE_INT, G_TYPE_INT);
+-      /**
+        * AtkTable::row-reordered:
+        * @atktable: the object which received the signal.
+        *
+diff -Naur atk-2.20.0/atk/atktext.c atk-2.20.0.patch/atk/atktext.c
+--- atk-2.20.0/atk/atktext.c	2016-02-15 12:29:12.000000000 +0100
++++ atk-2.20.0.patch/atk/atktext.c	2016-03-26 01:12:57.099480029 +0100
+@@ -20,7 +20,6 @@
+ #include "config.h"
+ 
+ #include "atk.h"
+-#include "atkmarshal.h"
+ 
+ #include <string.h>
+ 
+@@ -190,75 +189,6 @@
+       class->get_bounded_ranges = atk_text_real_get_bounded_ranges; 
+ 
+       /**
+-       * AtkText::text-changed:
+-       * @atktext: the object which received the signal.
+-       * @arg1: The position (character offset) of the insertion or deletion.
+-       * @arg2: The length (in characters) of text inserted or deleted.
+-       *
+-       * The "text-changed" signal is emitted when the text of the
+-       * object which implements the AtkText interface changes, This
+-       * signal will have a detail which is either "insert" or
+-       * "delete" which identifies whether the text change was an
+-       * insertion or a deletion.
+-       *
+-       * Deprecated: 2.9.4: Use #AtkObject::text-insert or
+-       * #AtkObject::text-remove instead.
+-       */
+-      atk_text_signals[TEXT_CHANGED] =
+-	g_signal_new ("text_changed",
+-		      ATK_TYPE_TEXT,
+-		      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
+-		      G_STRUCT_OFFSET (AtkTextIface, text_changed), 
+-		      (GSignalAccumulator) NULL, NULL,
+-		      atk_marshal_VOID__INT_INT,
+-		      G_TYPE_NONE,
+-		      2, G_TYPE_INT, G_TYPE_INT);
+-
+-      /**
+-       * AtkText::text-insert:
+-       * @atktext: the object which received the signal.
+-       * @arg1: The position (character offset) of the insertion.
+-       * @arg2: The length (in characters) of text inserted.
+-       * @arg3: The new text inserted
+-       *
+-       * The "text-insert" signal is emitted when a new text is
+-       * inserted. If the signal was not triggered by the user
+-       * (e.g. typing or pasting text), the "system" detail should be
+-       * included.
+-       */
+-      atk_text_signals[TEXT_INSERT] =
+-	g_signal_new ("text_insert",
+-		      ATK_TYPE_TEXT,
+-		      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
+-		      0,
+-		      (GSignalAccumulator) NULL, NULL,
+-		      atk_marshal_VOID__INT_INT_STRING,
+-		      G_TYPE_NONE,
+-		      3, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING);
+-
+-      /**
+-       * AtkText::text-remove:
+-       * @atktext: the object which received the signal.
+-       * @arg1: The position (character offset) of the removal.
+-       * @arg2: The length (in characters) of text removed.
+-       * @arg3: The old text removed
+-       *
+-       * The "text-remove" signal is emitted when a new text is
+-       * removed. If the signal was not triggered by the user
+-       * (e.g. typing or pasting text), the "system" detail should be
+-       * included.
+-       */
+-      atk_text_signals[TEXT_REMOVE] =
+-	g_signal_new ("text_remove",
+-		      ATK_TYPE_TEXT,
+-		      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
+-		      0,
+-		      (GSignalAccumulator) NULL, NULL,
+-		      atk_marshal_VOID__INT_INT_STRING,
+-		      G_TYPE_NONE,
+-		      3, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING);
+-
+-      /**
+        * AtkText::text-caret-moved:
+        * @atktext: the object which received the signal.
+        * @arg1: The new position of the text caret.
+diff -Naur atk-2.20.0/atk/atkutil.c atk-2.20.0.patch/atk/atkutil.c
+--- atk-2.20.0/atk/atkutil.c	2016-02-15 12:29:12.000000000 +0100
++++ atk-2.20.0.patch/atk/atkutil.c	2016-03-26 01:13:04.481490538 +0100
+@@ -20,7 +20,6 @@
+ #include "config.h"
+ 
+ #include "atkutil.h"
+-#include "atkmarshal.c"
+ 
+ /**
+  * SECTION:atkutil
+diff -Naur atk-2.20.0/atk/atkvalue.c atk-2.20.0.patch/atk/atkvalue.c
+--- atk-2.20.0/atk/atkvalue.c	2016-02-15 12:29:12.000000000 +0100
++++ atk-2.20.0.patch/atk/atkvalue.c	2016-03-26 01:18:03.268897883 +0100
+@@ -23,7 +23,6 @@
+ #include <glib/gi18n-lib.h>
+ 
+ #include "atkvalue.h"
+-#include "atkmarshal.h"
+ #include "atk-enum-types.h"
+ #include "atkprivate.h"
+ 
+@@ -322,42 +321,6 @@
+ atk_value_base_init (AtkValueIface *class)
+ {
+   static gboolean initialized = FALSE;
+-  if (!initialized)
+-    {
+-      /**
+-       * AtkValue::value-changed:
+-       * @atkvalue: the object on which the signal was emitted.
+-       * @value: the new value in a numerical form.
+-       * @text: human readable text alternative (also called
+-       * description) of this object. NULL if not available.
+-       *
+-       * The 'value-changed' signal is emitted when the current value
+-       * that represent the object changes. @value is the numerical
+-       * representation of this new value.  @text is the human
+-       * readable text alternative of @value, and can be NULL if it is
+-       * not available. Note that if there is a textual description
+-       * associated with the new numeric value, that description
+-       * should be included regardless of whether or not it has also
+-       * changed.
+-       *
+-       * Example: a password meter whose value changes as the user
+-       * types their new password. Appropiate value text would be
+-       * "weak", "acceptable" and "strong".
+-       *
+-       * Since: 2.12
+-       */
+-      atk_value_signals[VALUE_CHANGED] =
+-        g_signal_new ("value_changed",
+-                      ATK_TYPE_VALUE,
+-                      G_SIGNAL_RUN_LAST,
+-                      0,
+-                      (GSignalAccumulator) NULL, NULL,
+-                      atk_marshal_VOID__DOUBLE_STRING,
+-                      G_TYPE_NONE,
+-                      2, G_TYPE_DOUBLE, G_TYPE_STRING);
+-
+-      initialized = TRUE;
+-    }
+ }
+ 
+ /**
+diff -Naur atk-2.20.0/atk/atkwindow.c atk-2.20.0.patch/atk/atkwindow.c
+--- atk-2.20.0/atk/atkwindow.c	2016-02-15 12:29:12.000000000 +0100
++++ atk-2.20.0.patch/atk/atkwindow.c	2016-03-26 01:13:13.448503294 +0100
+@@ -20,7 +20,6 @@
+ #include "config.h"
+ 
+ #include "atkwindow.h"
+-#include "atkmarshal.h"
+ 
+ /**
+  * SECTION:atkwindow
+diff -Naur atk-2.20.0/atk/Makefile.am atk-2.20.0.patch/atk/Makefile.am
+--- atk-2.20.0/atk/Makefile.am	2016-02-15 12:29:12.000000000 +0100
++++ atk-2.20.0.patch/atk/Makefile.am	2016-03-26 01:08:29.075118340 +0100
+@@ -115,50 +115,7 @@
+ 
+ # ---------- Handle built sources ----------
+ 
+-BUILT_SOURCES = atkmarshal.h atkmarshal.c atk-enum-types.h atk-enum-types.c
+-
+-atkmarshal.h: stamp-atkmarshal.h
+-	@true
+-stamp-atkmarshal.h: @REBUILD@ atkmarshal.list
+-	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=atk_marshal $(srcdir)/atkmarshal.list --header >> xgen-gmh \
+-	&& (cmp -s xgen-gmh atkmarshal.h || cp xgen-gmh atkmarshal.h) \
+-	&& rm -f xgen-gmh xgen-gmh~					\
+-	&& echo timestamp > $(@F)
+-
+-atkmarshal.c: stamp-atkmarshal.c
+-	@true
+-stamp-atkmarshal.c: @REBUILD@ atkmarshal.list
+-	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=atk_marshal $(srcdir)/atkmarshal.list --body >> xgen-gmc \
+-	&& (cmp -s xgen-gmc atkmarshal.c || cp xgen-gmc atkmarshal.c) \
+-	&& rm -f xgen-gmc xgen-gmc~					\
+-	&& echo timestamp > $(@F)
+-
+-atk-enum-types.h: s-enum-types-h
+-	@true
+-s-enum-types-h: @REBUILD@ $(atk_headers) Makefile
+-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
+-			--fhead "#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)\n#error \"Only <atk/atk.h> can be included directly.\"\n#endif\n\n#ifndef __ATK_ENUM_TYPES_H__\n#define __ATK_ENUM_TYPES_H__\n\n#include <atk/atkversion.h>\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+-			--fprod "/* enumerations from \"@filename@\" */\n" \
+-			--vhead "ATK_AVAILABLE_IN_ALL\nGType @enum_name@_get_type (void);\n#define ATK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
+-			--ftail "G_END_DECLS\n\n#endif /* __ATK_ENUM_TYPES_H__ */" \
+-		$(atk_headers) ) > tmp-atk-enum-types.h \
+-	&& (cmp -s tmp-atk-enum-types.h atk-enum-types.h || cp tmp-atk-enum-types.h atk-enum-types.h ) \
+-	&& rm -f tmp-atk-enum-types.h \
+-	&& echo timestamp > $(@F)
+-
+-atk-enum-types.c: s-enum-types-c
+-	@true
+-s-enum-types-c: @REBUILD@ $(atk_headers) Makefile
+-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
+-			--fhead "#include \"config.h\"\n\n#include <atk.h>" \
+-			--fprod "\n/* enumerations from \"@filename@\" */" \
+-			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \
+-			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+-			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+-		$(atk_headers) ) > tmp-atk-enum-types.c \
+-	&& (cmp -s tmp-atk-enum-types.c atk-enum-types.c || cp tmp-atk-enum-types.c atk-enum-types.c ) \
+-	&& rm -f tmp-atk-enum-types.c \
+-	&& echo timestamp > $(@F)
++BUILT_SOURCES = atk-enum-types.h atk-enum-types.c
+ 
+ 
+ if HAVE_INTROSPECTION

packages/addons/addon-depends/containerd/package.mk

@@ -0,0 +1,77 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="containerd"
+PKG_VERSION="d2f0386"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="APL"
+PKG_SITE="https://containerd.tools/"
+PKG_URL="https://github.com/docker/containerd/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_HOST="toolchain go"
+PKG_PRIORITY="optional"
+PKG_SECTION="system"
+PKG_SHORTDESC="containerd is a daemon to control runC"
+PKG_LONGDESC="containerd is a daemon to control runC, built for performance and density. containerd leverages runC's advanced features such as seccomp and user namespace support as well as checkpoint and restore for cloning and live migration of containers."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_make_target() {
+  case $TARGET_ARCH in
+    x86_64)
+      export GOARCH=amd64
+      ;;
+    arm)
+      export GOARCH=arm
+
+      case $TARGET_CPU in
+        arm1176jzf-s)
+          export GOARM=6
+          ;;
+        cortex-a7)
+         export GOARM=7
+         ;;
+      esac
+      ;;
+  esac
+
+  export GOOS=linux
+  export CGO_ENABLED=1
+  export CGO_NO_EMULATION=1
+  export CGO_CFLAGS=$CFLAGS
+  export LDFLAGS="-w -extldflags -static -X github.com/docker/containerd.GitCommit=${PKG_VERSION} -extld $TARGET_CC"
+  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$ROOT/$PKG_BUILD.gopath:$ROOT/$PKG_BUILD/vendor/
+  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export PATH=$PATH:$GOROOT/bin
+
+  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/vendor/src/github.com/docker/containerd
+}
+
+make_target() {
+  mkdir -p bin
+  $GOLANG build -v -o bin/ctr             -a -tags "static_build" -ldflags "$LDFLAGS" ./ctr
+  $GOLANG build -v -o bin/containerd      -a -tags "static_build" -ldflags "$LDFLAGS" ./containerd
+  $GOLANG build -v -o bin/containerd-shim -a -tags "static_build" -ldflags "$LDFLAGS" ./containerd-shim
+}
+
+makeinstall_target() {
+  :
+}
+

packages/addons/addon-depends/cxxtools/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2016 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
@@ -48,6 +48,7 @@ post_makeinstall_host() {
 }
 
 post_makeinstall_target() {
-  rm -rf $SYSROOT_PREFIX/usr/bin/cxxtools-config
+  $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/cxxtools-config
+
   rm -rf $INSTALL/usr/bin
 }

packages/addons/addon-depends/enca/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2016 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
@@ -32,8 +32,6 @@ PKG_LONGDESC="Enca detects the encoding of text files, on the basis of knowledge
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-export CFLAGS="$CFLAGS -fPIC -DPIC"
-
 PKG_MAKEINSTALL_OPTS_TARGET="-C lib"
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__dev_random=yes \
                            ac_cv_file__dev_urandom=no \
@@ -47,6 +45,10 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__dev_random=yes \
                            --disable-rpath \
                            --with-gnu-ld"
 
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC -DPIC"
+}
+
 pre_make_target() {
   make CC="$HOST_CC" \
        CPPFLAGS="$HOST_CPPFLAGS" \

packages/addons/addon-depends/gdk-pixbuf/config/gdk-pixbuf.loaders

@@ -0,0 +1,132 @@
+# GdkPixbuf Image Loader Modules file
+# Automatically generated file, do not edit
+# Created by gdk-pixbuf-query-loaders from gdk-pixbuf-2.21.5
+#
+# LoaderDir = /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders
+#
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so"
+"ani" 4 "gdk-pixbuf" "The ANI image format" "LGPL"
+"application/x-navi-animation" ""
+"ani" ""
+"RIFF    ACON" "    xxxx    " 100
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.so"
+"bmp" 5 "gdk-pixbuf" "The BMP image format" "LGPL"
+"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
+"bmp" ""
+"BM" "" 100
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so"
+"gif" 4 "gdk-pixbuf" "The GIF image format" "LGPL"
+"image/gif" ""
+"gif" ""
+"GIF8" "" 100
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.so"
+"icns" 4 "gdk-pixbuf" "The ICNS image format" "GPL"
+"image/x-icns" ""
+"icns" ""
+"icns" "" 100
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so"
+"ico" 5 "gdk-pixbuf" "The ICO image format" "LGPL"
+"image/x-icon" "image/x-ico" "image/x-win-bitmap" ""
+"ico" "cur" ""
+"  \001   " "zz znz" 100
+"  \002   " "zz znz" 100
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jasper.so"
+"jpeg2000" 4 "gdk-pixbuf" "The JPEG 2000 image format" "LGPL"
+"image/jp2" "image/jpeg2000" "image/jpx" ""
+"jp2" "jpc" "jpx" "j2k" "jpf" ""
+"    jP" "!!!!  " 100
+"\377O\377Q" "" 100
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.so"
+"jpeg" 5 "gdk-pixbuf" "The JPEG image format" "LGPL"
+"image/jpeg" ""
+"jpeg" "jpe" "jpg" ""
+"\377\330" "" 100
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.so"
+"pcx" 4 "gdk-pixbuf" "The PCX image format" "LGPL"
+"image/x-pcx" ""
+"pcx" ""
+"\n \001" "" 100
+"\n\002\001" "" 100
+"\n\003\001" "" 100
+"\n\004\001" "" 100
+"\n\005\001" "" 100
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so"
+"png" 5 "gdk-pixbuf" "The PNG image format" "LGPL"
+"image/png" ""
+"png" ""
+"\211PNG\r\n\032\n" "" 100
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.so"
+"pnm" 4 "gdk-pixbuf" "The PNM/PBM/PGM/PPM image format family" "LGPL"
+"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
+"pnm" "pbm" "pgm" "ppm" ""
+"P1" "" 100
+"P2" "" 100
+"P3" "" 100
+"P4" "" 100
+"P5" "" 100
+"P6" "" 100
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.so"
+"qtif" 4 "gdk-pixbuf" "The QTIF image format" "LGPL"
+"image/x-quicktime" "image/qtif" ""
+"qtif" "qif" ""
+"abcdidsc" "xxxx    " 100
+"abcdidat" "xxxx    " 100
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.so"
+"ras" 4 "gdk-pixbuf" "The Sun raster image format" "LGPL"
+"image/x-cmu-raster" "image/x-sun-raster" ""
+"ras" ""
+"Y\246j\225" "" 100
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.so"
+"tga" 4 "gdk-pixbuf" "The Targa image format" "LGPL"
+"image/x-tga" ""
+"tga" "targa" ""
+" \001\001" "x  " 100
+" \001\t" "x  " 100
+"  \002" "xz " 99
+"  \003" "xz " 100
+"  \n" "xz " 100
+"  \013" "xz " 100
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.so"
+"tiff" 1 "gdk-pixbuf" "The TIFF image format" "LGPL"
+"image/tiff" ""
+"tiff" "tif" ""
+"MM *" "  z " 100
+"II* " "   z" 100
+"II* \020   CR\002 " "   z zzz   z" 0
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.so"
+"wbmp" 4 "gdk-pixbuf" "The WBMP image format" "LGPL"
+"image/vnd.wap.wbmp" ""
+"wbmp" ""
+"  " "zz" 1
+" `" "z " 1
+" @" "z " 1
+"  " "z " 1
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.so"
+"xbm" 4 "gdk-pixbuf" "The XBM image format" "LGPL"
+"image/x-xbitmap" ""
+"xbm" ""
+"#define " "" 100
+"/*" "" 50
+
+"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so"
+"xpm" 4 "gdk-pixbuf" "The XPM image format" "LGPL"
+"image/x-xpixmap" ""
+"xpm" ""
+"/* XPM */" "" 100
+
+

packages/addons/addon-depends/gdk-pixbuf/package.mk

@@ -0,0 +1,44 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="gdk-pixbuf"
+PKG_VERSION="2.34.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.gtk.org/"
+PKG_URL="http://ftp.acc.umu.se/pub/gnome/sources/gdk-pixbuf/2.34/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain glib libjpeg-turbo libpng jasper tiff"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/toolkits"
+PKG_SHORTDESC="gdk-pixbuf: a GNOME library for image loading and manipulation."
+PKG_LONGDESC="gdk-pixbuf (GdkPixbuf) is a GNOME library for image loading and manipulation. The GdkPixbuf documentation contains both the programmer's guide and the API reference."
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="gio_can_sniff=yes \
+                           --disable-gtk-doc \
+                           --disable-gtk-doc-html \
+                           --disable-gtk-doc-pdf \
+                           --disable-man \
+                           --with-libpng \
+                           --with-libjpeg \
+                           --with-libtiff \
+                           --with-libjasper"

packages/addons/addon-depends/gdk-pixbuf/patches/gdk-pixbuf-01_meh.patch

@@ -0,0 +1,58 @@
+diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
+index 8319b49..8f27c5c 100644
+--- a/gdk-pixbuf/Makefile.am
++++ b/gdk-pixbuf/Makefile.am
+@@ -617,51 +617,21 @@ MAINTAINERCLEANFILES = 		\
+ #
+ # gdk-pixbuf-enum-types.h
+ #
+-gdk-pixbuf-enum-types.h: s-enum-types-h
++gdk-pixbuf-enum-types.h:
+ 	@true
+ 
+-s-enum-types-h: @REBUILD@ $(gdk_pixbuf_headers) gdk-pixbuf-enum-types.h.template
+-	$(AM_V_GEN)( cd $(srcdir) && $(GLIB_MKENUMS) --template gdk-pixbuf-enum-types.h.template \
+-		$(gdk_pixbuf_headers) ) > tmp-gdk-pixbuf-enum-types.h \
+-	&& (cmp -s tmp-gdk-pixbuf-enum-types.h gdk-pixbuf-enum-types.h || cp tmp-gdk-pixbuf-enum-types.h gdk-pixbuf-enum-types.h ) \
+-	&& rm -f tmp-gdk-pixbuf-enum-types.h \
+-	&& echo timestamp > $(@F)
+-
+ CLEANFILES += tmp-gdk-pixbuf-enum-types.h
+ MAINTAINERCLEANFILES += s-enum-types-h
+ 
+ #
+-# gdk-pixbuf-enum-types.c
+-#
+-gdk-pixbuf-enum-types.c: @REBUILD@ $(gdk_pixbuf_headers) gdk-pixbuf-enum-types.c.template
+-	$(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) --template gdk-pixbuf-enum-types.c.template \
+-		  $(gdk_pixbuf_headers)) > gdk-pixbuf-enum-types.c
+-
+-#
+ # gdk-pixbuf-marshal.h
+ #
+-gdk-pixbuf-marshal.h: @REBUILD@ stamp-gdk-pixbuf-marshal.h
++gdk-pixbuf-marshal.h:
+ 	@true
+ 
+-stamp-gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
+-	$(AM_V_GEN)echo "#if !defined(GDK_PIXBUF_DISABLE_DEPRECATED) || defined(GDK_PIXBUF_COMPILATION)" > xgen-gmh \
+-	&& $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --header >> xgen-gmh \
+-	&& echo "#endif /* !GDK_PIXBUF_DISABLE_DEPRECATED || GDK_PIXBUF_COMPILATION */" >> xgen-gmh \
+-	&& (cmp -s xgen-gmh gdk-pixbuf-marshal.h || cp xgen-gmh gdk-pixbuf-marshal.h) \
+-	&& rm -f xgen-gmh xgen-gmh~ \
+-	&& echo timestamp > $(@F)
+-
+ CLEANFILES += xgen-gmh
+ MAINTAINERCLEANFILES += stamp-gdk-pixbuf-marshal.h
+ 
+-#
+-# gdk-pixbuf-marshal.c
+-#
+-$(srcdir)/gdk-pixbuf-marshal.c: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
+-	$(AM_V_GEN)(echo -e "#include <gdk-pixbuf/gdk-pixbuf.h>\n" | $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --body ) >> xgen-gmc \
+-	&& cp xgen-gmc gdk-pixbuf-marshal.c \
+-	&& rm -f xgen-gmc xgen-gmc~
+-
+ CLEANFILES += xgen-gmc
+ 
+ # if srcdir!=builddir, clean out maintainer-clean files from builddir

packages/addons/addon-depends/go/package.mk

@@ -0,0 +1,60 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="go"
+PKG_VERSION="1.6.2"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="BSD"
+PKG_SITE="https://golang.org"
+PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz"
+PKG_SOURCE_DIR="${PKG_NAME}-${PKG_NAME}${PKG_VERSION}"
+PKG_DEPENDS_HOST="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="system"
+PKG_SHORTDESC="Go is an open source programming language that makes it easy to build simple, reliable, and efficient software."
+PKG_LONGDESC="Go is an open source programming language that makes it easy to build simple, reliable, and efficient software."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+####################################################################
+# On Fedora `dnf install golang` will install go to /usr/lib/golang
+#
+# On Ubuntu you need to install golang manually, similar to:
+# $ wget https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz
+# $ tar xf go1.6.linux-amd64.tar.gz -C /opt/
+# $ ln -s /opt/go /usr/lib/golang
+####################################################################
+
+configure_host() {
+  export GOOS=linux
+  export GOROOT_FINAL=$ROOT/$TOOLCHAIN/lib/golang
+  export GOROOT_BOOTSTRAP=/usr/lib/golang
+  export GOARCH=amd64
+}
+
+make_host() {
+  cd $ROOT/$PKG_BUILD/src
+  bash make.bash --no-banner
+}
+
+makeinstall_host() {
+  mkdir -p $ROOT/$TOOLCHAIN/lib/golang
+  cp -av $ROOT/$PKG_BUILD/* $ROOT/$TOOLCHAIN/lib/golang/
+}

packages/addons/addon-depends/go/patches/go-0001-add-ca-cert-location.patch

@@ -0,0 +1,11 @@
+diff -Naur a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
+--- a/src/crypto/x509/root_unix.go	2016-04-19 16:27:35.000000000 -0700
++++ b/src/crypto/x509/root_unix.go	2016-04-22 01:21:02.884977461 -0700
+@@ -13,6 +13,7 @@
+ var certDirectories = []string{
+ 	"/etc/ssl/certs",               // SLES10/SLES11, https://golang.org/issue/12139
+ 	"/system/etc/security/cacerts", // Android
++	"/etc/ssl",                     // LibreELEC
+ }
+ 
+ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {

packages/addons/addon-depends/gpiozero/package.mk

@@ -0,0 +1,39 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="gpiozero"
+PKG_VERSION="1.2.0"
+PKG_REV="1"
+PKG_ARCH="arm"
+PKG_LICENSE="BSD"
+PKG_SITE="https://github.com/RPi-Distro/python-gpiozero"
+PKG_URL="https://pypi.python.org/packages/source/g/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="python"
+PKG_SHORTDESC="A simple interface to everyday GPIO components used with Raspberry Pi"
+PKG_LONGDESC="A simple interface to everyday GPIO components used with Raspberry Pi"
+PKG_AUTORECONF="no"
+
+make_target() {
+  : # nop
+}
+
+makeinstall_target() {
+  : # nop
+}

packages/addons/addon-depends/gtk+/package.mk

@@ -0,0 +1,57 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="gtk+"
+PKG_VERSION="2.24.30"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.gtk.org/"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain atk libX11 libXrandr libXi glib pango cairo gdk-pixbuf"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/toolkits"
+PKG_SHORTDESC="gtk+: The Gimp ToolKit (GTK)"
+PKG_LONGDESC="This is GTK+. GTK+, which stands for the Gimp ToolKit, is a library for creating graphical user interfaces for the X Window System. It is designed to be small, efficient, and flexible. GTK+ is written in C with a very object-oriented approach."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="ac_cv_path_GLIB_GENMARSHAL=$ROOT/$TOOLCHAIN/bin/glib-genmarshal \
+                           --disable-glibtest \
+                           --enable-modules \
+                           --enable-explicit-deps=no \
+                           --disable-debug \
+                           --enable-shm \
+                           --disable-cups \
+                           --disable-papi \
+                           --enable-xkb \
+                           --disable-xinerama \
+                           --disable-gtk-doc-html \
+                           --with-xinput"
+
+make_target() {
+  make SRC_SUBDIRS="gdk gtk modules"
+  $MAKEINSTALL SRC_SUBDIRS="gdk gtk modules"
+}
+
+makeinstall_target() {
+  make install DESTDIR=$INSTALL SRC_SUBDIRS="gdk gtk modules"
+}

packages/addons/addon-depends/gtk+/patches/gtk+-01_no-gtk-doc.patch

@@ -0,0 +1,64 @@
+From fca2ac06da064b133101f215efd5fbd738fb3ef9 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Thu, 27 Mar 2014 14:26:27 +0200
+Subject: [PATCH] no gtk-doc
+
+---
+ Makefile.am  |    3 +--
+ configure.ac |   12 ------------
+ 2 files changed, 1 insertions(+), 14 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8e3a2f1..35e94d2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,7 @@
+ include $(top_srcdir)/Makefile.decl
+ 
+ SRC_SUBDIRS = gdk gtk modules demos tests perf
+-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
++SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros build
+ 
+ # require automake 1.4
+ AUTOMAKE_OPTIONS = 1.7
+@@ -136,7 +136,6 @@ MAINTAINERCLEANFILES = \
+ 	$(srcdir)/mkinstalldirs \
+ 	$(srcdir)/omf.make \
+ 	$(srcdir)/xmldocs.make \
+-	$(srcdir)/gtk-doc.make \
+ 	$(srcdir)/ChangeLog \
+ 	`find "$(srcdir)" -type f -name Makefile.in -print`
+ 
+diff --git a/configure.ac b/configure.ac
+index 245a87f..f6ede8a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1594,8 +1594,6 @@ GOBJECT_INTROSPECTION_CHECK([0.9.3])
+ # Checks for gtk-doc and docbook-tools
+ ##################################################
+ 
+-GTK_DOC_CHECK([1.11])
+-
+ AC_CHECK_PROG(DB2HTML, db2html, true, false)
+ AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
+ 
+@@ -1727,16 +1725,6 @@ demos/Makefile
+ demos/gtk-demo/Makefile
+ demos/gtk-demo/geninclude.pl
+ tests/Makefile
+-docs/Makefile
+-docs/reference/Makefile
+-docs/reference/gdk/Makefile
+-docs/reference/gdk/version.xml
+-docs/reference/gtk/Makefile
+-docs/reference/gtk/version.xml
+-docs/reference/libgail-util/Makefile
+-docs/faq/Makefile
+-docs/tools/Makefile
+-docs/tutorial/Makefile
+ build/Makefile
+ build/win32/Makefile
+ build/win32/vs9/Makefile
+-- 
+1.7.2.5
+

packages/addons/addon-depends/gtk+/patches/gtk+-02_meh-glib.patch

@@ -0,0 +1,34 @@
+From 3cb23c7b05be36e130bd1930dad3382ce8c08c51 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sun, 26 Oct 2014 00:26:09 +0300
+Subject: [PATCH] meh glib
+
+---
+ gdk/Makefile.am |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdk/Makefile.am b/gdk/Makefile.am
+index c880f6e..7661530 100644
+--- a/gdk/Makefile.am
++++ b/gdk/Makefile.am
+@@ -307,7 +307,7 @@ lib_LTLIBRARIES = $(gdktargetlib)
+ 
+ EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la
+ 
+-MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
++MAINTAINERCLEANFILES = $(gdk_built_sources)
+ EXTRA_DIST += $(gdk_built_sources)
+ EXTRA_HEADERS =
+ 
+@@ -333,7 +333,7 @@ BUILT_SOURCES = \
+ 	$(gdk_built_sources)			\
+ 	gdkconfig.h
+ 
+-gdkenumtypes.h: stamp-gdkenumtypes.h
++gdkenumtypes.h:
+ 	@true
+ stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.h.template
+ 	( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \
+-- 
+1.7.2.5
+

packages/addons/addon-depends/harfbuzz/package.mk

@@ -1,4 +1,3 @@
-#!/bin/sh
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@@ -19,25 +18,21 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-echo "getting sources..."
-  if [ ! -d ffmpeg-xbmc.git ]; then
-    git clone https://github.com/xbmc/FFmpeg.git -b release/2.2-xbmc ffmpeg-xbmc.git
-  fi
+PKG_NAME="harfbuzz"
+PKG_VERSION="1.2.5"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+PKG_URL="http://www.freedesktop.org/software/harfbuzz/release/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain glib freetype cairo"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/toolkits"
+PKG_SHORTDESC="harfbuzz: an OpenType text shaping engine."
+PKG_LONGDESC="HarfBuzz is an OpenType text shaping engine."
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
 
-  cd ffmpeg-xbmc.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
+PKG_MAINTAINER="none"
 
-echo "copying sources..."
-  rm -rf ffmpeg-xbmc-$GIT_REV
-  cp -R ffmpeg-xbmc.git ffmpeg-xbmc-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf ffmpeg-xbmc-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf ffmpeg-xbmc-$GIT_REV.tar.xz ffmpeg-xbmc-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf ffmpeg-xbmc-$GIT_REV
+PKG_CONFIGURE_OPTS_TARGET="--with-icu=no"

packages/addons/addon-depends/libXScrnSaver/package.mk

@@ -0,0 +1,35 @@
+################################################################################
+#      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="libXScrnSaver"
+PKG_VERSION="1.2.2"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://xorg.freedesktop.org/"
+PKG_URL="http://xorg.freedesktop.org/releases/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain scrnsaverproto"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/lib"
+PKG_SHORTDESC=""
+PKG_LONGDESC=""
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --enable-malloc0returnsnull"

packages/addons/addon-depends/libXcursor/package.mk

@@ -1,4 +1,3 @@
-#!/bin/sh
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@@ -19,25 +18,20 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-echo "getting sources..."
-  if [ ! -d libnfs.git ]; then
-    git clone git://github.com/sahlberg/libnfs.git libnfs.git
-  fi
+PKG_NAME="libXcursor"
+PKG_VERSION="1.1.14"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.X.org"
+PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain libX11 libXfixes libXrender"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/lib"
+PKG_SHORTDESC="libXcursor: X Cursor Library"
+PKG_LONGDESC="X11 Cursor management library"
 
-  cd libnfs.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
 
-echo "copying sources..."
-  rm -rf libnfs-$GIT_REV
-  cp -R libnfs.git libnfs-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf libnfs-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvjf libnfs-$GIT_REV.tar.bz2 libnfs-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf libnfs-$GIT_REV
+PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"

packages/addons/addon-depends/libXft/package.mk

@@ -0,0 +1,35 @@
+################################################################################
+#      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="libXft"
+PKG_VERSION="2.3.2"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.X.org"
+PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain util-macros xproto libXrender fontconfig freetype"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/lib"
+PKG_SHORTDESC="libxft: X FreeType library"
+PKG_LONGDESC="X FreeType library"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"

packages/addons/addon-depends/libdvbcsa/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2016 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
@@ -17,12 +17,13 @@
 ################################################################################
 
 PKG_NAME="libdvbcsa"
-PKG_VERSION="1.1.0"
+PKG_VERSION="f988715"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.videolan.org/developers/libdvbcsa.html"
-PKG_URL="http://download.videolan.org/pub/videolan/libdvbcsa/${PKG_VERSION}/libdvbcsa-${PKG_VERSION}.tar.gz"
+PKG_SITE="https://github.com/glenvt18/libdvbcsa/"
+PKG_URL="https://github.com/glenvt18/libdvbcsa/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="lib"
@@ -33,3 +34,23 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static --with-sysroot=$SYSROOT_PREFIX"
+
+if echo "$TARGET_FPU" | grep -q '^neon'; then
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-neon"
+elif [ "$TARGET_ARCH" = x86_64  ]; then
+  if echo "$PROJECT_CFLAGS" | grep -q '\-mssse3'; then
+    PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-ssse3"
+  elif echo "$PROJECT_CFLAGS" | grep -q '\-msse2'; then
+    PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-sse2"
+  else
+    PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-uint64"
+  fi
+fi
+
+pre_configure_target() {
+# libdvbcsa is a bit faster without LTO, and tests will fail with gcc-5.x
+  strip_lto
+
+  export CFLAGS="$CFLAGS -fPIC"
+}
+

packages/addons/addon-depends/libexif/package.mk

@@ -0,0 +1,33 @@
+################################################################################
+#      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="libexif"
+PKG_VERSION="0.6.21"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="LGPL"
+PKG_SITE="http://sourceforge.net/projects/libexif"
+PKG_URL="http://downloads.sf.net/sourceforge/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="lib"
+PKG_SHORTDESC="A library to parse an EXIF file and read the data from those tags"
+PKG_LONGDESC="A library to parse an EXIF file and read the data from those tags"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"

packages/addons/addon-depends/libiconv/package.mk

@@ -0,0 +1,45 @@
+################################################################################
+#      This file is part of LibreELEC - https://LibreELEC.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="libiconv"
+PKG_VERSION="1.14"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://savannah.gnu.org/projects/libiconv/"
+PKG_URL="http://ftp.gnu.org/pub/gnu/libiconv/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="devel"
+PKG_SHORTDESC="Libiconv converts from one character encoding to another through Unicode conversion."
+PKG_LONGDESC="Libiconv converts from one character encoding to another through Unicode conversion."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_TARGET="--host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --includedir=/usr/include/iconv \
+            --libdir=/usr/lib/iconv \
+            --sysconfdir=/etc \
+            --enable-static \
+            --disable-shared \
+            --disable-nls \
+            --disable-extra-encodings \
+            --with-gnu-ld"

packages/addons/addon-depends/libiconv/patches/libiconv-glibc-fix-2.16.patch

@@ -0,0 +1,16 @@
+from
+http://www.itkb.ro/kb/linux/patch-libiconv-pentru-glibc-216
+
+--- a/srclib/stdio.in.h.orig	2011-08-07 16:42:06.000000000 +0300
++++ b/srclib/stdio.in.h	2013-01-10 15:53:03.000000000 +0200
+@@ -695,7 +695,9 @@
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
++ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ #endif
+ 
+ 

packages/addons/addon-depends/libva-vdpau-driver/package.mk

@@ -0,0 +1,37 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2016 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="libva-vdpau-driver"
+PKG_VERSION="0.7.4"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://freedesktop.org/wiki/Software/vaapi"
+PKG_URL="http://freedesktop.org/software/vaapi/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain libva libvdpau mesa"
+PKG_PRIORITY="optional"
+PKG_SECTION="graphics"
+PKG_SHORTDESC="VDPAU backend for VA API"
+PKG_LONGDESC="VDPAU backend for VA API"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+post_makeinstall_target() {
+  rm -rf $INSTALL/usr/lib/va/s3g_drv_video.so
+}

packages/addons/addon-depends/libva-vdpau-driver/patches/libva-vdpau-driver-0001_drop-formats.patch

@@ -0,0 +1,29 @@
+>From fda3706eb74ba5ad874853969f3df3e372739c8d Mon Sep 17 00:00:00 2001
+From: "Xiang, Haihao" <haihao.xiang@intel.com>
+Date: Fri, 21 Jun 2013 12:55:30 +0800
+Subject: [PATCH] VAEncH264VUIBufferType and VAEncH264SEIBufferType are
+ dropped from VA API
+
+The driver doesn't use them indeed
+
+Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+---
+ src/vdpau_dump.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/vdpau_dump.c b/src/vdpau_dump.c
+index 899888b..610e7cd 100644
+--- a/src/vdpau_dump.c
++++ b/src/vdpau_dump.c
+@@ -59,8 +59,6 @@ const char *string_of_VABufferType(VABufferType type)
+         _(VAEncSequenceParameterBufferType);
+         _(VAEncPictureParameterBufferType);
+         _(VAEncSliceParameterBufferType);
+-        _(VAEncH264VUIBufferType);
+-        _(VAEncH264SEIBufferType);
+ #endif
+ #if VA_CHECK_VERSION(0,31,1)
+         _(VAQMatrixBufferType);
+-- 
+1.7.9.5
+

packages/addons/addon-depends/libva-vdpau-driver/patches/libva-vdpau-driver-0002_glext-missing-definition.patch

@@ -0,0 +1,16 @@
+--- a/src/utils_glx.h~	2012-10-05 16:02:58.000000000 +0100
++++ b/src/utils_glx.h	2012-10-19 08:44:12.469642440 +0100
+@@ -48,6 +48,13 @@
+ typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int);
+ #endif
+ 
++#if GL_GLEXT_VERSION >= 85
++/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
++   block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
++   Redefine the type here as an interim solution */
++typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
++#endif
++                    
+ #ifndef GL_FRAMEBUFFER_BINDING
+ #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT
+ #endif

packages/addons/addon-depends/libva-vdpau-driver/patches/libva-vdpau-driver-0003_libvdpau-0.8.patch

@@ -0,0 +1,11 @@
+--- a/src/vdpau_decode.c
++++ b/src/vdpau_decode.c
+@@ -1289,7 +1289,7 @@
+             driver_data,
+             obj_context->vdp_decoder,
+             obj_surface->vdp_surface,
+-            (VdpPictureInfo)&obj_context->vdp_picture_info,
++            (VdpPictureInfo *)&obj_context->vdp_picture_info,
+             obj_context->vdp_bitstream_buffers_count,
+             obj_context->vdp_bitstream_buffers
+         );

packages/addons/addon-depends/libzip/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2016 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/addon-depends/ninja/package.mk

@@ -16,26 +16,29 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="scons"
-PKG_VERSION="2.2.0"
+PKG_NAME="ninja"
+PKG_VERSION="1.6.0"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.scons.org/"
-PKG_URL="$SOURCEFORGE_SRC/scons/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="Python:host"
+PKG_LICENSE="Apache"
+PKG_SITE="http://martine.github.io/ninja/"
+PKG_URL="https://github.com/ninja-build/ninja/archive/v$PKG_VERSION.tar.gz"
 PKG_PRIORITY="optional"
-PKG_SECTION="python/devel"
-PKG_SHORTDESC="SCons: an Open Source software construction tool—that is, a next-generation build tool."
-PKG_LONGDESC="SCons is an Open Source software construction tool—that is, a next-generation build tool."
+PKG_SECTION="devel"
+PKG_SHORTDESC="Small build system with a focus on speed"
+PKG_LONGDESC="Small build system with a focus on speed"
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
+configure_host() {
+  :
+}
+
 make_host() {
- : # nothing todo
+  python2 configure.py --bootstrap
 }
 
 makeinstall_host() {
-  python setup.py install --prefix=$ROOT/$TOOLCHAIN
+  cp ninja $ROOT/$TOOLCHAIN/bin/
 }

packages/addons/addon-depends/nspr/package.mk

@@ -1,4 +1,3 @@
-#!/bin/sh
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@@ -19,25 +18,31 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-echo "getting sources..."
-  if [ ! -d arm-mem.git ]; then
-    git clone git://github.com/bavison/arm-mem.git -b master arm-mem.git
-  fi
+PKG_NAME="nspr"
+PKG_VERSION="4.12"
+PKG_REV="2"
+PKG_ARCH="any"
+PKG_LICENSE="Mozilla Public License"
+PKG_SITE="http://www.linuxfromscratch.org/blfs/view/svn/general/nspr.html"
+PKG_DEPENDS_TARGET="toolchain nss:host"
+PKG_PRIORITY="optional"
+PKG_SECTION="security"
+PKG_SHORTDESC="Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc like functions"
+PKG_LONGDESC="Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc like functions"
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
 
-  cd arm-mem.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
+MAKEFLAGS=-j1
 
-echo "copying sources..."
-  rm -rf arm-mem-$GIT_REV
-  cp -R arm-mem.git arm-mem-$GIT_REV
+if [ "$TARGET_ARCH" = "x86_64" ] ; then
+  TARGET_USE_64="--enable-64bit"
+fi
 
-echo "cleaning sources..."
-  rm -rf arm-mem-$GIT_REV/.git
+PKG_CONFIGURE_OPTS_TARGET="--with-pthreads $TARGET_USE_64"
+PKG_MAKE_OPTS_TARGET="NSINSTALL=$ROOT/$TOOLCHAIN/bin/nsinstall"
+PKG_MAKEINSTALL_OPTS_TARGET="NSINSTALL=$ROOT/$TOOLCHAIN/bin/nsinstall"
 
-echo "packing sources..."
-  tar cvJf arm-mem-$GIT_REV.tar.xz arm-mem-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf arm-mem-$GIT_REV
+configure_target() {
+  cd $(get_build_dir nss)/nspr
+  ./configure --with-pthreads $TARGET_USE_64 $TARGET_CONFIGURE_OPTS 
+}

packages/addons/addon-depends/nss/package.mk

@@ -0,0 +1,78 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="nss"
+PKG_VERSION="3.22.3"
+PKG_REV="2"
+PKG_ARCH="any"
+PKG_LICENSE="Mozilla Public License"
+PKG_SITE="http://ftp.mozilla.org/"
+PKG_URL="http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_22_3_RTM/src/nss-3.22.3-with-nspr-4.12.tar.gz"
+PKG_DEPENDS_TARGET="toolchain nss:host nspr"
+PKG_PRIORITY="optional"
+PKG_SECTION="security"
+PKG_SHORTDESC="The Network Security Services (NSS) package is a set of libraries designed to support cross-platform development of security-enabled client and server applications"
+PKG_LONGDESC="The Network Security Services (NSS) package is a set of libraries designed to support cross-platform development of security-enabled client and server applications"
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+MAKEFLAGS=-j1
+
+make_host() {
+  cd $ROOT/$PKG_BUILD/nss
+
+  [ "$TARGET_ARCH" = "x86_64" ] && export USE_64=1
+
+  make -C coreconf/nsinstall  
+}
+
+makeinstall_host() {
+  cp $ROOT/$PKG_BUILD/nss/coreconf/nsinstall/*/nsinstall $ROOT/$TOOLCHAIN/bin
+}
+
+post_makeinstall_host() {
+  rm -rf $ROOT/$PKG_BUILD/nss/coreconf/nsinstall/Linux*
+}
+
+make_target() {
+  cd $ROOT/$PKG_BUILD/nss
+
+  [ "$TARGET_ARCH" = "x86_64" ] && TARGET_USE_64="USE_64=1"
+
+  make BUILD_OPT=1 $TARGET_USE_64 \
+     NSPR_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include/nspr \
+     USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz \
+     OS_TEST=$TARGET_ARCH \
+     NSS_TESTS="dummy" \
+     NSINSTALL=$ROOT/$TOOLCHAIN/bin/nsinstall \
+     CPU_ARCH_TAG=$TARGET_ARCH \
+     CC=$TARGET_CC LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib" \
+     V=1
+}
+
+makeinstall_target() {
+  cd $ROOT/$PKG_BUILD
+  $STRIP dist/Linux*/lib/*.so
+  cp -L dist/Linux*/lib/*.so $SYSROOT_PREFIX/usr/lib
+  cp -L dist/Linux*/lib/libcrmf.a $SYSROOT_PREFIX/usr/lib
+  mkdir -p $SYSROOT_PREFIX/usr/include/nss
+  cp -RL dist/{public,private}/nss/* $SYSROOT_PREFIX/usr/include/nss
+  cp -L dist/Linux*/lib/pkgconfig/nss.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+}

packages/addons/addon-depends/nss/patches/nss-01_crosscompile.patch

@@ -0,0 +1,27 @@
+diff --git a/nss/cmd/shlibsign/Makefile b/nss/cmd/shlibsign/Makefile
+index 83f90fa..177feee 100644
+--- a/nss/cmd/shlibsign/Makefile
++++ b/nss/cmd/shlibsign/Makefile
+@@ -95,5 +95,3 @@ else
+     endif
+ endif
+ 
+-libs install :: $(CHECKLOC)
+-
+diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk
+index a586e5e..e815b72 100644
+--- a/nss/coreconf/Linux.mk
++++ b/nss/coreconf/Linux.mk
+@@ -16,12 +16,6 @@ ifeq ($(USE_PTHREADS),1)
+ 	IMPL_STRATEGY = _PTH
+ endif
+ 
+-CC			= gcc
+-CCC			= g++
+-RANLIB			= ranlib
+-
+-DEFAULT_COMPILER = gcc
+-
+ ifeq ($(OS_TARGET),Android)
+ ifndef ANDROID_NDK
+ 	$(error Must set ANDROID_NDK to the path to the android NDK first)

packages/addons/addon-depends/nss/patches/nss-02_3.15.5-standalone-1.patch

@@ -0,0 +1,241 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2013-07-02
+Initial Package Version: 3.15
+Upstream Status:         Not applicable
+Origin:                  Based on dj's original patch, rediffed and modified for 3.15
+Description:             Adds auto-generated nss.pc and nss-config script, and allows
+                         building without nspr in the source tree.
+
+--- a/nss/config/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ b/nss/config/Makefile	2013-07-02 14:53:56.684750636 +0200
+@@ -0,0 +1,40 @@
++CORE_DEPTH = ..
++DEPTH      = ..
++
++include $(CORE_DEPTH)/coreconf/config.mk
++
++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
++PREFIX = /usr
++
++all: export libs
++
++export:
++	# Create the nss.pc file
++	mkdir -p $(DIST)/lib/pkgconfig
++	sed -e "s,@prefix@,$(PREFIX)," \
++	    -e "s,@exec_prefix@,\$${prefix}," \
++	    -e "s,@libdir@,\$${prefix}/lib," \
++	    -e "s,@includedir@,\$${prefix}/include/nss," \
++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++	    nss.pc.in > nss.pc
++	chmod 0644 nss.pc
++	ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
++
++	# Create the nss-config script
++	mkdir -p $(DIST)/bin
++	sed -e "s,@prefix@,$(PREFIX)," \
++	    -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
++	    -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++	    -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++	    nss-config.in > nss-config
++	chmod 0755 nss-config
++	ln -sf ../../../nss/config/nss-config $(DIST)/bin
++
++libs:
++
++dummy: all export libs
++
+--- a/nss/config/nss-config.in	1970-01-01 01:00:00.000000000 +0100
++++ b/nss/config/nss-config.in	2013-07-02 14:52:58.328084334 +0200
+@@ -0,0 +1,153 @@
++#!/bin/sh
++
++prefix=@prefix@
++
++major_version=@NSS_MAJOR_VERSION@
++minor_version=@NSS_MINOR_VERSION@
++patch_version=@NSS_PATCH_VERSION@
++
++usage()
++{
++	cat <<EOF
++Usage: nss-config [OPTIONS] [LIBRARIES]
++Options:
++	[--prefix[=DIR]]
++	[--exec-prefix[=DIR]]
++	[--includedir[=DIR]]
++	[--libdir[=DIR]]
++	[--version]
++	[--libs]
++	[--cflags]
++Dynamic Libraries:
++	nss
++	nssutil
++	smime
++	ssl
++	softokn
++EOF
++	exit $1
++}
++
++if test $# -eq 0; then
++	usage 1 1>&2
++fi
++
++lib_nss=yes
++lib_nssutil=yes
++lib_smime=yes
++lib_ssl=yes
++lib_softokn=yes
++
++while test $# -gt 0; do
++  case "$1" in
++  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++  *) optarg= ;;
++  esac
++
++  case $1 in
++    --prefix=*)
++      prefix=$optarg
++      ;;
++    --prefix)
++      echo_prefix=yes
++      ;;
++    --exec-prefix=*)
++      exec_prefix=$optarg
++      ;;
++    --exec-prefix)
++      echo_exec_prefix=yes
++      ;;
++    --includedir=*)
++      includedir=$optarg
++      ;;
++    --includedir)
++      echo_includedir=yes
++      ;;
++    --libdir=*)
++      libdir=$optarg
++      ;;
++    --libdir)
++      echo_libdir=yes
++      ;;
++    --version)
++      echo ${major_version}.${minor_version}.${patch_version}
++      ;;
++    --cflags)
++      echo_cflags=yes
++      ;;
++    --libs)
++      echo_libs=yes
++      ;;
++    nss)
++      lib_nss=yes
++      ;;
++    nssutil)
++      lib_nssutil=yes
++      ;;
++    smime)
++      lib_smime=yes
++      ;;
++    ssl)
++      lib_ssl=yes
++      ;;
++    softokn)
++      lib_softokn=yes
++      ;;
++    *)
++      usage 1 1>&2
++      ;;
++  esac
++  shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "$exec_prefix"; then
++    exec_prefix=`pkg-config --variable=exec_prefix nss`
++fi
++if test -z "$includedir"; then
++    includedir=`pkg-config --variable=includedir nss`
++fi
++if test -z "$libdir"; then
++    libdir=`pkg-config --variable=libdir nss`
++fi
++
++if test "$echo_prefix" = "yes"; then
++    echo $prefix
++fi
++
++if test "$echo_exec_prefix" = "yes"; then
++    echo $exec_prefix
++fi
++
++if test "$echo_includedir" = "yes"; then
++    echo $includedir
++fi
++
++if test "$echo_libdir" = "yes"; then
++    echo $libdir
++fi
++
++if test "$echo_cflags" = "yes"; then
++    echo -I$includedir
++fi
++
++if test "$echo_libs" = "yes"; then
++      libdirs="-L$libdir"
++      if test -n "$lib_nss"; then
++	libdirs="$libdirs -lnss${major_version}"
++      fi
++      if test -n "$lib_nssutil"; then
++        libdirs="$libdirs -lnssutil${major_version}"
++      fi
++      if test -n "$lib_smime"; then
++	libdirs="$libdirs -lsmime${major_version}"
++      fi
++      if test -n "$lib_ssl"; then
++	libdirs="$libdirs -lssl${major_version}"
++      fi
++      if test -n "$lib_softokn"; then
++        libdirs="$libdirs -lsoftokn${major_version}"
++      fi
++      echo $libdirs
++fi      
++
+--- a/nss/config/nss.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ b/nss/config/nss.pc.in	2013-07-02 14:52:58.328084334 +0200
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: NSS
++Description: Network Security Services
++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
++Requires: nspr >= 4.8
++Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
++Cflags: -I${includedir}
++
+--- a/nss/Makefile	2013-05-28 23:43:24.000000000 +0200
++++ b/nss/Makefile	2013-07-02 14:52:58.328084334 +0200
+@@ -44,7 +44,7 @@
+ # (7) Execute "local" rules. (OPTIONAL).                              #
+ #######################################################################
+ 
+-nss_build_all: build_nspr all
++nss_build_all: all
+ 
+ nss_clean_all: clobber_nspr clobber
+ 
+--- a/nss/manifest.mn	2013-05-28 23:43:24.000000000 +0200
++++ b/nss/manifest.mn	2013-07-02 14:52:58.331417666 +0200
+@@ -10,4 +10,4 @@
+ 
+ RELEASE = nss
+ 
+-DIRS = coreconf lib cmd external_tests
++DIRS = coreconf lib cmd config

packages/addons/addon-depends/pango/config/pango.modules

@@ -0,0 +1,18 @@
+# Pango Modules file
+# Automatically generated file, do not edit
+#
+# ModulesPath = /usr/lib/pango/1.8.0/modules
+#
+/usr/lib/pango/1.8.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:*
+/usr/lib/pango/1.8.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc common:
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:*
+/usr/lib/pango/1.8.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:*
+

packages/addons/addon-depends/pango/config/pangorc

@@ -0,0 +1,6 @@
+[Pango]
+ModuleFiles = /etc/pango/pango.modules
+ModulesPath = /usr/lib/pango/1.8.0/modules
+
+[PangoX]
+AliasFiles = /etc/pango/pangox.aliases

packages/addons/addon-depends/pango/package.mk

@@ -0,0 +1,40 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="pango"
+PKG_VERSION="1.40.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.pango.org/"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/pango/1.40/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain glib cairo freetype fontconfig libX11 libXft harfbuzz"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/toolkits"
+PKG_SHORTDESC="pango: Library for layout and rendering of internationalized text"
+PKG_LONGDESC="The goal of the Pango project is to provide an open-source framework for the layout and rendering of internationalized text. Pango is an offshoot of the GTK+ and GNOME projects, and the initial focus is operation in those environments, however there is nothing fundamentally GTK+ or GNOME specific about Pango. Pango uses Unicode for all of its encoding, and will eventually support output in all the worlds major languages."
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-doc-cross-references \
+                           --disable-gtk-doc \
+                           --disable-man \
+                           --enable-debug=no \
+                           --with-xft"

packages/addons/addon-depends/pango/patches/pango-01_no-gtk-doc.patch

@@ -0,0 +1,46 @@
+diff -Naur pango-1.38.1/configure.ac pango-1.38.1.patch/configure.ac
+--- pango-1.38.1/configure.ac	2015-10-12 21:13:25.000000000 +0200
++++ pango-1.38.1.patch/configure.ac	2015-11-14 23:14:05.714344868 +0100
+@@ -483,15 +483,6 @@
+ dnl *** Checks for gtk-doc ***
+ dnl **************************
+ 
+-if $have_cairo ; then : ; else
+-   if  test x$enable_gtk_doc = xyes ; then
+-      AC_MSG_WARN([Cairo not present, disabling doc building])      
+-      enable_gtk_doc=no
+-   fi
+-fi
+-
+-GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
+-
+ AC_ARG_ENABLE(doc-cross-references,
+               AC_HELP_STRING([--disable-doc-cross-references],
+                              [cross reference glib and cairo symbols @<:@default=yes@:>@]),
+@@ -606,7 +597,6 @@
+ pango/pangoxft.rc
+ pango-view/Makefile
+ examples/Makefile
+-docs/Makefile
+ docs/version.xml
+ tools/Makefile
+ tests/Makefile
+diff -Naur pango-1.38.1/Makefile.am pango-1.38.1.patch/Makefile.am
+--- pango-1.38.1/Makefile.am	2015-04-15 19:37:43.000000000 +0200
++++ pango-1.38.1.patch/Makefile.am	2015-11-14 23:05:52.738361176 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in.
+ 
+-SUBDIRS= pango pango-view examples docs tools tests build
++SUBDIRS= pango pango-view examples tools tests build
+ 
+ EXTRA_DIST = 			\
+ 	autogen.sh		\
+@@ -38,7 +38,6 @@
+ 	$(srcdir)/INSTALL \
+ 	$(srcdir)/omf.make \
+ 	$(srcdir)/xmldocs.make \
+-	$(srcdir)/gtk-doc.make \
+ 	$(srcdir)/ChangeLog
+ 
+ ### ChangeLog generation

packages/addons/addon-depends/pango/patches/pango-02_meh.patch

@@ -0,0 +1,79 @@
+diff -Naur pango-1.38.1/Makefile.am pango-1.38.1.patch/Makefile.am
+--- pango-1.38.1/Makefile.am	2015-11-14 23:05:52.000000000 +0100
++++ pango-1.38.1.patch/Makefile.am	2015-11-14 23:19:07.548943525 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in.
+ 
+-SUBDIRS= pango pango-view examples tools tests build
++SUBDIRS= pango build
+ 
+ EXTRA_DIST = 			\
+ 	autogen.sh		\
+diff -Naur pango-1.38.1/pango/Makefile.am pango-1.38.1.patch/pango/Makefile.am
+--- pango-1.38.1/pango/Makefile.am	2015-09-01 00:47:11.000000000 +0200
++++ pango-1.38.1.patch/pango/Makefile.am	2015-11-14 23:21:14.081145117 +0100
+@@ -31,7 +31,7 @@
+ 	$(LIBTHAI_CFLAGS)					\
+ 	$(X_CFLAGS)
+ 
+-BUILT_SOURCES = pango-enum-types.h pango-enum-types.c pango-features.h
++BUILT_SOURCES = pango-features.h
+ 
+ pangoincludedir=$(includedir)/pango-1.0/pango
+ 
+@@ -127,22 +127,6 @@
+ 	pango-features.h   \
+ 	pango-enum-types.h
+ 
+-pango-enum-types.h: s-enum-types-h
+-s-enum-types-h: $(pango_headers) Makefile.am pango-enum-types.h.template
+-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
+-			 --template pango-enum-types.h.template \
+-			$(pango_headers) ) > pango-enum-types.h.tmp \
+-			&& mv pango-enum-types.h.tmp pango-enum-types.h \
+-			&& echo timestamp > $@
+-
+-pango-enum-types.c: s-enum-types-c
+-s-enum-types-c: $(pango_headers) Makefile.am pango-enum-types.c.template
+-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
+-			 --template pango-enum-types.c.template \
+-			$(pango_headers) ) > pango-enum-types.c.tmp \
+-			&& mv pango-enum-types.c.tmp pango-enum-types.c \
+-			&& echo timestamp > $@
+-
+ pango-features.h:
+ 	$(AM_V_GEN) cd $(top_builddir) && ./config.status pango/pango-features.h
+ 
+diff -Naur pango-1.38.1/pango/pango-context.c pango-1.38.1.patch/pango/pango-context.c
+--- pango-1.38.1/pango/pango-context.c	2015-09-13 17:05:39.000000000 +0200
++++ pango-1.38.1.patch/pango/pango-context.c	2015-11-14 23:22:57.512225981 +0100
+@@ -38,6 +38,7 @@
+ 
+ #include "pango-engine-private.h"
+ #include "pango-script-private.h"
++#include "pango-enum-types.h"
+ 
+ /**
+  * PangoContext:
+diff -Naur pango-1.38.1/pango/pangofc-font.c pango-1.38.1.patch/pango/pangofc-font.c
+--- pango-1.38.1/pango/pangofc-font.c	2015-04-15 19:37:43.000000000 +0200
++++ pango-1.38.1.patch/pango/pangofc-font.c	2015-11-14 23:23:49.840316980 +0100
+@@ -45,6 +45,7 @@
+ #include "pango-engine.h"
+ #include "pango-layout.h"
+ #include "pango-impl-utils.h"
++#include "pango-enum-types.h"
+ 
+ #include <fontconfig/fcfreetype.h>
+ 
+diff -Naur pango-1.38.1/pango/pango-layout.c pango-1.38.1.patch/pango/pango-layout.c
+--- pango-1.38.1/pango/pango-layout.c	2015-09-01 18:20:54.000000000 +0200
++++ pango-1.38.1.patch/pango/pango-layout.c	2015-11-14 23:23:19.280262638 +0100
+@@ -77,6 +77,7 @@
+ #include <string.h>
+ 
+ #include "pango-layout-private.h"
++#include "pango-enum-types.h"
+ 
+ 
+ typedef struct _Extents Extents;

packages/addons/addon-depends/pcsc-lite/package.mk

@@ -0,0 +1,39 @@
+################################################################################
+#      This file is part of LibreELEC - https://LibreELEC.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="pcsc-lite"
+PKG_VERSION="1.8.16"
+PKG_REV="0"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://pcsclite.alioth.debian.org/pcsclite.html"
+PKG_URL="https://alioth.debian.org/frs/download.php/file/4164/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain libusb"
+PKG_PRIORITY="optional"
+PKG_SECTION="service/system"
+PKG_SHORTDESC="Middleware to access a smart card using SCard API (PC/SC)"
+PKG_LONGDESC="Middleware to access a smart card using SCard API (PC/SC)"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
+            --enable-static \
+            --disable-libudev \
+            --enable-libusb \
+            --enable-usbdropdir=/storage/.kodi/addons/service.system.pcscd-addon/drivers"

packages/addons/addon-depends/picamera/package.mk

@@ -0,0 +1,39 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="picamera"
+PKG_VERSION="1.10"
+PKG_REV="1"
+PKG_ARCH="arm"
+PKG_LICENSE="BSD"
+PKG_SITE="https://github.com/waveform80/picamera"
+PKG_URL="https://pypi.python.org/packages/source/p/picamera/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain Python distutilscross:host bcm2835-driver"
+PKG_PRIORITY="optional"
+PKG_SECTION="python"
+PKG_SHORTDESC="A python and shell interface for the Raspberry Pi camera module"
+PKG_LONGDESC="A python and shell interface for the Raspberry Pi camera module"
+PKG_AUTORECONF="no"
+
+make_target() {
+  : # nop
+}
+
+makeinstall_target() {
+  : # nop
+}

packages/addons/addon-depends/protobuf/package.mk

@@ -0,0 +1,42 @@
+################################################################################
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="protobuf"
+PKG_VERSION="2.6.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="https://developers.google.com/protocol-buffers/"
+PKG_URL="https://github.com/google/$PKG_NAME/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_HOST="toolchain zlib"
+PKG_DEPENDS_TARGET="toolchain zlib protobuf:host"
+PKG_PRIORITY="optional"
+PKG_SECTION="devel"
+PKG_SHORTDESC="protobuf: Protocol Buffers - Google's data interchange format"
+PKG_LONGDESC="protobuf: Protocol Buffers - Google's data interchange format"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared"
+PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static --with-protoc=$ROOT/$TOOLCHAIN/bin/protoc"
+
+post_makeinstall_target() {
+  rm -rf $INSTALL/usr/bin
+
+  # HACK: we have protoc in $TOOLCHAIN/bin but it seems
+  # the one from sysroot prefix is picked when building hyperion. remove it!
+  rm -f $SYSROOT_PREFIX/usr/bin/protoc
+}

packages/addons/addon-depends/protobuf/patches/01_pr1333.patch

@@ -0,0 +1,923 @@
+From cab5eae3e0dc8cc13d06b8d94bf4759d14e1c20e Mon Sep 17 00:00:00 2001
+From: john hood <cgull@glup.org>
+Date: Fri, 18 Mar 2016 23:56:51 +0000
+Subject: [PATCH] Replace ancient m4/acx_pthread.m4 with m4/ax_pthread.m4
+
+---
+ configure.ac      |   5 +-
+ m4/acx_pthread.m4 | 397 --------------------------------------------
+ m4/ax_pthread.m4  | 485 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 487 insertions(+), 400 deletions(-)
+ delete mode 100644 m4/acx_pthread.m4
+ create mode 100644 m4/ax_pthread.m4
+
+diff --git a/configure.ac b/configure.ac
+index 33a6c64..dc39ee6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,9 +149,8 @@ AS_IF([test "$with_protoc" != "no"], [
+ ])
+ AM_CONDITIONAL([USE_EXTERNAL_PROTOC], [test "$with_protoc" != "no"])
+ 
+-ACX_PTHREAD
+-AM_CONDITIONAL([HAVE_PTHREAD], [test "x$acx_pthread_ok" = "xyes"])
+-
++AX_PTHREAD
++AM_CONDITIONAL([HAVE_PTHREAD], [test "x$ax_pthread_ok" = "xyes"])
+ # We still keep this for improving pbconfig.h for unsupported platforms.
+ AC_CXX_STL_HASH
+ 
+diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4
+deleted file mode 100644
+index 89d42c7..0000000
+--- a/m4/acx_pthread.m4
++++ /dev/null
+@@ -1,397 +0,0 @@
+-# This was retrieved from
+-#    http://svn.0pointer.de/viewvc/trunk/common/acx_pthread.m4?revision=1277&root=avahi
+-# See also (perhaps for new versions?)
+-#    http://svn.0pointer.de/viewvc/trunk/common/acx_pthread.m4?root=avahi
+-#
+-# We've rewritten the inconsistency check code (from avahi), to work
+-# more broadly.  In particular, it no longer assumes ld accepts -zdefs.
+-# This caused a restructing of the code, but the functionality has only
+-# changed a little.
+-
+-dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+-dnl
+-dnl @summary figure out how to build C programs using POSIX threads
+-dnl
+-dnl This macro figures out how to build C programs using POSIX threads.
+-dnl It sets the PTHREAD_LIBS output variable to the threads library and
+-dnl linker flags, and the PTHREAD_CFLAGS output variable to any special
+-dnl C compiler flags that are needed. (The user can also force certain
+-dnl compiler flags/libs to be tested by setting these environment
+-dnl variables.)
+-dnl
+-dnl Also sets PTHREAD_CC to any special C compiler that is needed for
+-dnl multi-threaded programs (defaults to the value of CC otherwise).
+-dnl (This is necessary on AIX to use the special cc_r compiler alias.)
+-dnl
+-dnl NOTE: You are assumed to not only compile your program with these
+-dnl flags, but also link it with them as well. e.g. you should link
+-dnl with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS
+-dnl $LIBS
+-dnl
+-dnl If you are only building threads programs, you may wish to use
+-dnl these variables in your default LIBS, CFLAGS, and CC:
+-dnl
+-dnl        LIBS="$PTHREAD_LIBS $LIBS"
+-dnl        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+-dnl        CC="$PTHREAD_CC"
+-dnl
+-dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
+-dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
+-dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+-dnl
+-dnl ACTION-IF-FOUND is a list of shell commands to run if a threads
+-dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to
+-dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the
+-dnl default action will define HAVE_PTHREAD.
+-dnl
+-dnl Please let the authors know if this macro fails on any platform, or
+-dnl if you have any other suggestions or comments. This macro was based
+-dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with
+-dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros
+-dnl posted by Alejandro Forero Cuervo to the autoconf macro repository.
+-dnl We are also grateful for the helpful feedback of numerous users.
+-dnl
+-dnl @category InstalledPackages
+-dnl @author Steven G. Johnson <stevenj@alum.mit.edu>
+-dnl @version 2006-05-29
+-dnl @license GPLWithACException
+-dnl 
+-dnl Checks for GCC shared/pthread inconsistency based on work by
+-dnl Marcin Owsiany <marcin@owsiany.pl>
+-
+-
+-AC_DEFUN([ACX_PTHREAD], [
+-AC_REQUIRE([AC_CANONICAL_HOST])
+-AC_LANG_SAVE
+-AC_LANG_C
+-acx_pthread_ok=no
+-
+-# We used to check for pthread.h first, but this fails if pthread.h
+-# requires special compiler flags (e.g. on True64 or Sequent).
+-# It gets checked for in the link test anyway.
+-
+-# First of all, check if the user has set any of the PTHREAD_LIBS,
+-# etcetera environment variables, and if threads linking works using
+-# them:
+-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+-        save_CFLAGS="$CFLAGS"
+-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+-        save_LIBS="$LIBS"
+-        LIBS="$PTHREAD_LIBS $LIBS"
+-        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+-        AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
+-        AC_MSG_RESULT($acx_pthread_ok)
+-        if test x"$acx_pthread_ok" = xno; then
+-                PTHREAD_LIBS=""
+-                PTHREAD_CFLAGS=""
+-        fi
+-        LIBS="$save_LIBS"
+-        CFLAGS="$save_CFLAGS"
+-fi
+-
+-# We must check for the threads library under a number of different
+-# names; the ordering is very important because some systems
+-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+-# libraries is broken (non-POSIX).
+-
+-# Create a list of thread flags to try.  Items starting with a "-" are
+-# C compiler flags, and other items are library names, except for "none"
+-# which indicates that we try without any flags at all, and "pthread-config"
+-# which is a program returning the flags for the Pth emulation library.
+-
+-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+-
+-# The ordering *is* (sometimes) important.  Some notes on the
+-# individual items follow:
+-
+-# pthreads: AIX (must check this before -lpthread)
+-# none: in case threads are in libc; should be tried before -Kthread and
+-#       other compiler flags to prevent continual compiler warnings
+-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+-# -pthreads: Solaris/gcc
+-# -mthreads: Mingw32/gcc, Lynx/gcc
+-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+-#      doesn't hurt to check since this sometimes defines pthreads too;
+-#      also defines -D_REENTRANT)
+-#      ... -mt is also the pthreads flag for HP/aCC
+-# pthread: Linux, etcetera
+-# --thread-safe: KAI C++
+-# pthread-config: use pthread-config program (for GNU Pth library)
+-
+-case "${host_cpu}-${host_os}" in
+-        *solaris*)
+-
+-        # On Solaris (at least, for some versions), libc contains stubbed
+-        # (non-functional) versions of the pthreads routines, so link-based
+-        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+-        # a function called by this macro, so we could check for that, but
+-        # who knows whether they'll stub that too in a future libc.)  So,
+-        # we'll just look for -pthreads and -lpthread first:
+-
+-        acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
+-        ;;
+-esac
+-
+-if test x"$acx_pthread_ok" = xno; then
+-for flag in $acx_pthread_flags; do
+-
+-        case $flag in
+-                none)
+-                AC_MSG_CHECKING([whether pthreads work without any flags])
+-                ;;
+-
+-                -*)
+-                AC_MSG_CHECKING([whether pthreads work with $flag])
+-                PTHREAD_CFLAGS="$flag"
+-                ;;
+-
+-		pthread-config)
+-		AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
+-		if test x"$acx_pthread_config" = xno; then continue; fi
+-		PTHREAD_CFLAGS="`pthread-config --cflags`"
+-		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+-		;;
+-
+-                *)
+-                AC_MSG_CHECKING([for the pthreads library -l$flag])
+-                PTHREAD_LIBS="-l$flag"
+-                ;;
+-        esac
+-
+-        save_LIBS="$LIBS"
+-        save_CFLAGS="$CFLAGS"
+-        LIBS="$PTHREAD_LIBS $LIBS"
+-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+-
+-        # Check for various functions.  We must include pthread.h,
+-        # since some functions may be macros.  (On the Sequent, we
+-        # need a special flag -Kthread to make this header compile.)
+-        # We check for pthread_join because it is in -lpthread on IRIX
+-        # while pthread_create is in libc.  We check for pthread_attr_init
+-        # due to DEC craziness with -lpthreads.  We check for
+-        # pthread_cleanup_push because it is one of the few pthread
+-        # functions on Solaris that doesn't have a non-functional libc stub.
+-        # We try pthread_create on general principles.
+-        AC_TRY_LINK([#include <pthread.h>],
+-                    [pthread_t th; pthread_join(th, 0);
+-                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
+-                     pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+-                    [acx_pthread_ok=yes])
+-
+-        LIBS="$save_LIBS"
+-        CFLAGS="$save_CFLAGS"
+-
+-        AC_MSG_RESULT($acx_pthread_ok)
+-        if test "x$acx_pthread_ok" = xyes; then
+-                break;
+-        fi
+-
+-        PTHREAD_LIBS=""
+-        PTHREAD_CFLAGS=""
+-done
+-fi
+-
+-# Various other checks:
+-if test "x$acx_pthread_ok" = xyes; then
+-        save_LIBS="$LIBS"
+-        LIBS="$PTHREAD_LIBS $LIBS"
+-        save_CFLAGS="$CFLAGS"
+-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+-
+-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+-	AC_MSG_CHECKING([for joinable pthread attribute])
+-	attr_name=unknown
+-	for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+-	    AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
+-                        [attr_name=$attr; break])
+-	done
+-        AC_MSG_RESULT($attr_name)
+-        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+-            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
+-                               [Define to necessary symbol if this constant
+-                                uses a non-standard name on your system.])
+-        fi
+-
+-        AC_MSG_CHECKING([if more special flags are required for pthreads])
+-        flag=no
+-        case "${host_cpu}-${host_os}" in
+-            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
+-            *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+-        esac
+-        AC_MSG_RESULT(${flag})
+-        if test "x$flag" != xno; then
+-            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+-        fi
+-
+-        LIBS="$save_LIBS"
+-        CFLAGS="$save_CFLAGS"
+-        # More AIX lossage: must compile with xlc_r or cc_r
+-	if test x"$GCC" != xyes; then
+-          AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
+-        else
+-          PTHREAD_CC=$CC
+-	fi
+-
+-	# The next part tries to detect GCC inconsistency with -shared on some
+-	# architectures and systems. The problem is that in certain
+-	# configurations, when -shared is specified, GCC "forgets" to
+-	# internally use various flags which are still necessary.
+-	
+-	#
+-	# Prepare the flags
+-	#
+-	save_CFLAGS="$CFLAGS"
+-	save_LIBS="$LIBS"
+-	save_CC="$CC"
+-	
+-	# Try with the flags determined by the earlier checks.
+-	#
+-	# -Wl,-z,defs forces link-time symbol resolution, so that the
+-	# linking checks with -shared actually have any value
+-	#
+-	# FIXME: -fPIC is required for -shared on many architectures,
+-	# so we specify it here, but the right way would probably be to
+-	# properly detect whether it is actually required.
+-	CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS $PTHREAD_CFLAGS"
+-	LIBS="$PTHREAD_LIBS $LIBS"
+-	CC="$PTHREAD_CC"
+-	
+-	# In order not to create several levels of indentation, we test
+-	# the value of "$done" until we find the cure or run out of ideas.
+-	done="no"
+-	
+-	# First, make sure the CFLAGS we added are actually accepted by our
+-	# compiler.  If not (and OS X's ld, for instance, does not accept -z),
+-	# then we can't do this test.
+-	if test x"$done" = xno; then
+-	   AC_MSG_CHECKING([whether to check for GCC pthread/shared inconsistencies])
+-	   AC_TRY_LINK(,, , [done=yes])
+-	
+-	   if test "x$done" = xyes ; then
+-	      AC_MSG_RESULT([no])
+-	   else
+-	      AC_MSG_RESULT([yes])
+-	   fi
+-	fi
+-	
+-	if test x"$done" = xno; then
+-	   AC_MSG_CHECKING([whether -pthread is sufficient with -shared])
+-	   AC_TRY_LINK([#include <pthread.h>],
+-	      [pthread_t th; pthread_join(th, 0);
+-	      pthread_attr_init(0); pthread_cleanup_push(0, 0);
+-	      pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+-	      [done=yes])
+-	   
+-	   if test "x$done" = xyes; then
+-	      AC_MSG_RESULT([yes])
+-	   else
+-	      AC_MSG_RESULT([no])
+-	   fi
+-	fi
+-	
+-	#
+-	# Linux gcc on some architectures such as mips/mipsel forgets
+-	# about -lpthread
+-	#
+-	if test x"$done" = xno; then
+-	   AC_MSG_CHECKING([whether -lpthread fixes that])
+-	   LIBS="-lpthread $PTHREAD_LIBS $save_LIBS"
+-	   AC_TRY_LINK([#include <pthread.h>],
+-	      [pthread_t th; pthread_join(th, 0);
+-	      pthread_attr_init(0); pthread_cleanup_push(0, 0);
+-	      pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+-	      [done=yes])
+-	
+-	   if test "x$done" = xyes; then
+-	      AC_MSG_RESULT([yes])
+-	      PTHREAD_LIBS="-lpthread $PTHREAD_LIBS"
+-	   else
+-	      AC_MSG_RESULT([no])
+-	   fi
+-	fi
+-	#
+-	# FreeBSD 4.10 gcc forgets to use -lc_r instead of -lc
+-	#
+-	if test x"$done" = xno; then
+-	   AC_MSG_CHECKING([whether -lc_r fixes that])
+-	   LIBS="-lc_r $PTHREAD_LIBS $save_LIBS"
+-	   AC_TRY_LINK([#include <pthread.h>],
+-	       [pthread_t th; pthread_join(th, 0);
+-	        pthread_attr_init(0); pthread_cleanup_push(0, 0);
+-	        pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+-	       [done=yes])
+-	
+-	   if test "x$done" = xyes; then
+-	      AC_MSG_RESULT([yes])
+-	      PTHREAD_LIBS="-lc_r $PTHREAD_LIBS"
+-	   else
+-	      AC_MSG_RESULT([no])
+-	   fi
+-	fi
+-	if test x"$done" = xno; then
+-	   # OK, we have run out of ideas
+-	   AC_MSG_WARN([Impossible to determine how to use pthreads with shared libraries])
+-	
+-	   # so it's not safe to assume that we may use pthreads
+-	   acx_pthread_ok=no
+-	fi
+-	
+-	AC_MSG_CHECKING([whether what we have so far is sufficient with -nostdlib])
+-	CFLAGS="-nostdlib $CFLAGS"
+-	# we need c with nostdlib
+-	LIBS="$LIBS -lc"
+-	AC_TRY_LINK([#include <pthread.h>],
+-	      [pthread_t th; pthread_join(th, 0);
+-	       pthread_attr_init(0); pthread_cleanup_push(0, 0);
+-	       pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+-	      [done=yes],[done=no])
+-
+-	if test "x$done" = xyes; then
+-	   AC_MSG_RESULT([yes])
+-	else
+-	   AC_MSG_RESULT([no])
+-	fi
+-	
+-	if test x"$done" = xno; then
+-	   AC_MSG_CHECKING([whether -lpthread saves the day])
+-	   LIBS="-lpthread $LIBS"
+-	   AC_TRY_LINK([#include <pthread.h>],
+-	      [pthread_t th; pthread_join(th, 0);
+-	       pthread_attr_init(0); pthread_cleanup_push(0, 0);
+-	       pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+-	      [done=yes],[done=no])
+-
+-	   if test "x$done" = xyes; then
+-	      AC_MSG_RESULT([yes])
+-	      PTHREAD_LIBS="$PTHREAD_LIBS -lpthread"
+-	   else
+-	      AC_MSG_RESULT([no])
+-	      AC_MSG_WARN([Impossible to determine how to use pthreads with shared libraries and -nostdlib])
+-	   fi
+-	fi
+-
+-	CFLAGS="$save_CFLAGS"
+-	LIBS="$save_LIBS"
+-	CC="$save_CC"
+-else
+-        PTHREAD_CC="$CC"
+-fi
+-
+-AC_SUBST(PTHREAD_LIBS)
+-AC_SUBST(PTHREAD_CFLAGS)
+-AC_SUBST(PTHREAD_CC)
+-
+-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+-if test x"$acx_pthread_ok" = xyes; then
+-        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
+-        :
+-else
+-        acx_pthread_ok=no
+-        $2
+-fi
+-AC_LANG_RESTORE
+-])dnl ACX_PTHREAD
+diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
+new file mode 100644
+index 0000000..d218d1a
+--- /dev/null
++++ b/m4/ax_pthread.m4
+@@ -0,0 +1,485 @@
++# ===========================================================================
++#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
++#
++# DESCRIPTION
++#
++#   This macro figures out how to build C programs using POSIX threads. It
++#   sets the PTHREAD_LIBS output variable to the threads library and linker
++#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
++#   flags that are needed. (The user can also force certain compiler
++#   flags/libs to be tested by setting these environment variables.)
++#
++#   Also sets PTHREAD_CC to any special C compiler that is needed for
++#   multi-threaded programs (defaults to the value of CC otherwise). (This
++#   is necessary on AIX to use the special cc_r compiler alias.)
++#
++#   NOTE: You are assumed to not only compile your program with these flags,
++#   but also to link with them as well. For example, you might link with
++#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
++#
++#   If you are only building threaded programs, you may wish to use these
++#   variables in your default LIBS, CFLAGS, and CC:
++#
++#     LIBS="$PTHREAD_LIBS $LIBS"
++#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++#     CC="$PTHREAD_CC"
++#
++#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
++#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
++#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
++#
++#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
++#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
++#   PTHREAD_CFLAGS.
++#
++#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
++#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
++#   is not found. If ACTION-IF-FOUND is not specified, the default action
++#   will define HAVE_PTHREAD.
++#
++#   Please let the authors know if this macro fails on any platform, or if
++#   you have any other suggestions or comments. This macro was based on work
++#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
++#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
++#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
++#   grateful for the helpful feedback of numerous users.
++#
++#   Updated for Autoconf 2.68 by Daniel Richard G.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
++#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
++#
++#   This program is free software: you can redistribute it and/or modify it
++#   under the terms of the GNU General Public License as published by the
++#   Free Software Foundation, either version 3 of the License, or (at your
++#   option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++#   Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License along
++#   with this program. If not, see <http://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright owner
++#   gives unlimited permission to copy, distribute and modify the configure
++#   scripts that are the output of Autoconf when processing the Macro. You
++#   need not follow the terms of the GNU General Public License when using
++#   or distributing such scripts, even though portions of the text of the
++#   Macro appear in them. The GNU General Public License (GPL) does govern
++#   all other use of the material that constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the Autoconf
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 22
++
++AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
++AC_DEFUN([AX_PTHREAD], [
++AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([AC_PROG_CC])
++AC_REQUIRE([AC_PROG_SED])
++AC_LANG_PUSH([C])
++ax_pthread_ok=no
++
++# We used to check for pthread.h first, but this fails if pthread.h
++# requires special compiler flags (e.g. on Tru64 or Sequent).
++# It gets checked for in the link test anyway.
++
++# First of all, check if the user has set any of the PTHREAD_LIBS,
++# etcetera environment variables, and if threads linking works using
++# them:
++if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
++	ax_pthread_save_CC="$CC"
++	ax_pthread_save_CFLAGS="$CFLAGS"
++	ax_pthread_save_LIBS="$LIBS"
++	AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
++	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++	LIBS="$PTHREAD_LIBS $LIBS"
++	AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
++	AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
++	AC_MSG_RESULT([$ax_pthread_ok])
++	if test "x$ax_pthread_ok" = "xno"; then
++		PTHREAD_LIBS=""
++		PTHREAD_CFLAGS=""
++	fi
++	CC="$ax_pthread_save_CC"
++	CFLAGS="$ax_pthread_save_CFLAGS"
++	LIBS="$ax_pthread_save_LIBS"
++fi
++
++# We must check for the threads library under a number of different
++# names; the ordering is very important because some systems
++# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
++# libraries is broken (non-POSIX).
++
++# Create a list of thread flags to try.  Items starting with a "-" are
++# C compiler flags, and other items are library names, except for "none"
++# which indicates that we try without any flags at all, and "pthread-config"
++# which is a program returning the flags for the Pth emulation library.
++
++ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
++
++# The ordering *is* (sometimes) important.  Some notes on the
++# individual items follow:
++
++# pthreads: AIX (must check this before -lpthread)
++# none: in case threads are in libc; should be tried before -Kthread and
++#       other compiler flags to prevent continual compiler warnings
++# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
++# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
++#           (Note: HP C rejects this with "bad form for `-t' option")
++# -pthreads: Solaris/gcc (Note: HP C also rejects)
++# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
++#      doesn't hurt to check since this sometimes defines pthreads and
++#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
++#      is present but should not be used directly; and before -mthreads,
++#      because the compiler interprets this as "-mt" + "-hreads")
++# -mthreads: Mingw32/gcc, Lynx/gcc
++# pthread: Linux, etcetera
++# --thread-safe: KAI C++
++# pthread-config: use pthread-config program (for GNU Pth library)
++
++case $host_os in
++
++	freebsd*)
++
++	# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
++	# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
++
++	ax_pthread_flags="-kthread lthread $ax_pthread_flags"
++	;;
++
++	hpux*)
++
++	# From the cc(1) man page: "[-mt] Sets various -D flags to enable
++	# multi-threading and also sets -lpthread."
++
++	ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
++	;;
++
++	openedition*)
++
++	# IBM z/OS requires a feature-test macro to be defined in order to
++	# enable POSIX threads at all, so give the user a hint if this is
++	# not set. (We don't define these ourselves, as they can affect
++	# other portions of the system API in unpredictable ways.)
++
++	AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
++	    [
++#	     if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
++	     AX_PTHREAD_ZOS_MISSING
++#	     endif
++	    ],
++	    [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
++	;;
++
++	solaris*)
++
++	# On Solaris (at least, for some versions), libc contains stubbed
++	# (non-functional) versions of the pthreads routines, so link-based
++	# tests will erroneously succeed. (N.B.: The stubs are missing
++	# pthread_cleanup_push, or rather a function called by this macro,
++	# so we could check for that, but who knows whether they'll stub
++	# that too in a future libc.)  So we'll check first for the
++	# standard Solaris way of linking pthreads (-mt -lpthread).
++
++	ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
++	;;
++esac
++
++# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
++
++AS_IF([test "x$GCC" = "xyes"],
++      [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"])
++
++# The presence of a feature test macro requesting re-entrant function
++# definitions is, on some systems, a strong hint that pthreads support is
++# correctly enabled
++
++case $host_os in
++	darwin* | hpux* | linux* | osf* | solaris*)
++	ax_pthread_check_macro="_REENTRANT"
++	;;
++
++	aix* | freebsd*)
++	ax_pthread_check_macro="_THREAD_SAFE"
++	;;
++
++	*)
++	ax_pthread_check_macro="--"
++	;;
++esac
++AS_IF([test "x$ax_pthread_check_macro" = "x--"],
++      [ax_pthread_check_cond=0],
++      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
++
++# Are we compiling with Clang?
++
++AC_CACHE_CHECK([whether $CC is Clang],
++    [ax_cv_PTHREAD_CLANG],
++    [ax_cv_PTHREAD_CLANG=no
++     # Note that Autoconf sets GCC=yes for Clang as well as GCC
++     if test "x$GCC" = "xyes"; then
++	AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
++	    [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
++#	     if defined(__clang__) && defined(__llvm__)
++	     AX_PTHREAD_CC_IS_CLANG
++#	     endif
++	    ],
++	    [ax_cv_PTHREAD_CLANG=yes])
++     fi
++    ])
++ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
++
++ax_pthread_clang_warning=no
++
++# Clang needs special handling, because older versions handle the -pthread
++# option in a rather... idiosyncratic way
++
++if test "x$ax_pthread_clang" = "xyes"; then
++
++	# Clang takes -pthread; it has never supported any other flag
++
++	# (Note 1: This will need to be revisited if a system that Clang
++	# supports has POSIX threads in a separate library.  This tends not
++	# to be the way of modern systems, but it's conceivable.)
++
++	# (Note 2: On some systems, notably Darwin, -pthread is not needed
++	# to get POSIX threads support; the API is always present and
++	# active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
++	# -pthread does define _REENTRANT, and while the Darwin headers
++	# ignore this macro, third-party headers might not.)
++
++	PTHREAD_CFLAGS="-pthread"
++	PTHREAD_LIBS=
++
++	ax_pthread_ok=yes
++
++	# However, older versions of Clang make a point of warning the user
++	# that, in an invocation where only linking and no compilation is
++	# taking place, the -pthread option has no effect ("argument unused
++	# during compilation").  They expect -pthread to be passed in only
++	# when source code is being compiled.
++	#
++	# Problem is, this is at odds with the way Automake and most other
++	# C build frameworks function, which is that the same flags used in
++	# compilation (CFLAGS) are also used in linking.  Many systems
++	# supported by AX_PTHREAD require exactly this for POSIX threads
++	# support, and in fact it is often not straightforward to specify a
++	# flag that is used only in the compilation phase and not in
++	# linking.  Such a scenario is extremely rare in practice.
++	#
++	# Even though use of the -pthread flag in linking would only print
++	# a warning, this can be a nuisance for well-run software projects
++	# that build with -Werror.  So if the active version of Clang has
++	# this misfeature, we search for an option to squash it.
++
++	AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
++	    [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
++	    [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
++	     # Create an alternate version of $ac_link that compiles and
++	     # links in two steps (.c -> .o, .o -> exe) instead of one
++	     # (.c -> exe), because the warning occurs only in the second
++	     # step
++	     ax_pthread_save_ac_link="$ac_link"
++	     ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
++	     ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
++	     ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
++	     ax_pthread_save_CFLAGS="$CFLAGS"
++	     for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
++		AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
++		CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
++		ac_link="$ax_pthread_save_ac_link"
++		AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
++		    [ac_link="$ax_pthread_2step_ac_link"
++		     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
++			 [break])
++		    ])
++	     done
++	     ac_link="$ax_pthread_save_ac_link"
++	     CFLAGS="$ax_pthread_save_CFLAGS"
++	     AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
++	     ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
++	    ])
++
++	case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
++		no | unknown) ;;
++		*) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
++	esac
++
++fi # $ax_pthread_clang = yes
++
++if test "x$ax_pthread_ok" = "xno"; then
++for ax_pthread_try_flag in $ax_pthread_flags; do
++
++	case $ax_pthread_try_flag in
++		none)
++		AC_MSG_CHECKING([whether pthreads work without any flags])
++		;;
++
++		-mt,pthread)
++		AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
++		PTHREAD_CFLAGS="-mt"
++		PTHREAD_LIBS="-lpthread"
++		;;
++
++		-*)
++		AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
++		PTHREAD_CFLAGS="$ax_pthread_try_flag"
++		;;
++
++		pthread-config)
++		AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
++		AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
++		PTHREAD_CFLAGS="`pthread-config --cflags`"
++		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
++		;;
++
++		*)
++		AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
++		PTHREAD_LIBS="-l$ax_pthread_try_flag"
++		;;
++	esac
++
++	ax_pthread_save_CFLAGS="$CFLAGS"
++	ax_pthread_save_LIBS="$LIBS"
++	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++	LIBS="$PTHREAD_LIBS $LIBS"
++
++	# Check for various functions.  We must include pthread.h,
++	# since some functions may be macros.  (On the Sequent, we
++	# need a special flag -Kthread to make this header compile.)
++	# We check for pthread_join because it is in -lpthread on IRIX
++	# while pthread_create is in libc.  We check for pthread_attr_init
++	# due to DEC craziness with -lpthreads.  We check for
++	# pthread_cleanup_push because it is one of the few pthread
++	# functions on Solaris that doesn't have a non-functional libc stub.
++	# We try pthread_create on general principles.
++
++	AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
++#			if $ax_pthread_check_cond
++#			 error "$ax_pthread_check_macro must be defined"
++#			endif
++			static void routine(void *a) { a = 0; }
++			static void *start_routine(void *a) { return a; }],
++		       [pthread_t th; pthread_attr_t attr;
++			pthread_create(&th, 0, start_routine, 0);
++			pthread_join(th, 0);
++			pthread_attr_init(&attr);
++			pthread_cleanup_push(routine, 0);
++			pthread_cleanup_pop(0) /* ; */])],
++	    [ax_pthread_ok=yes],
++	    [])
++
++	CFLAGS="$ax_pthread_save_CFLAGS"
++	LIBS="$ax_pthread_save_LIBS"
++
++	AC_MSG_RESULT([$ax_pthread_ok])
++	AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
++
++	PTHREAD_LIBS=""
++	PTHREAD_CFLAGS=""
++done
++fi
++
++# Various other checks:
++if test "x$ax_pthread_ok" = "xyes"; then
++	ax_pthread_save_CFLAGS="$CFLAGS"
++	ax_pthread_save_LIBS="$LIBS"
++	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++	LIBS="$PTHREAD_LIBS $LIBS"
++
++	# Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
++	AC_CACHE_CHECK([for joinable pthread attribute],
++	    [ax_cv_PTHREAD_JOINABLE_ATTR],
++	    [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
++	     for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
++		 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
++						 [int attr = $ax_pthread_attr; return attr /* ; */])],
++				[ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
++				[])
++	     done
++	    ])
++	AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
++	       test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
++	       test "x$ax_pthread_joinable_attr_defined" != "xyes"],
++	      [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
++				  [$ax_cv_PTHREAD_JOINABLE_ATTR],
++				  [Define to necessary symbol if this constant
++				   uses a non-standard name on your system.])
++	       ax_pthread_joinable_attr_defined=yes
++	      ])
++
++	AC_CACHE_CHECK([whether more special flags are required for pthreads],
++	    [ax_cv_PTHREAD_SPECIAL_FLAGS],
++	    [ax_cv_PTHREAD_SPECIAL_FLAGS=no
++	     case $host_os in
++	     solaris*)
++	     ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
++	     ;;
++	     esac
++	    ])
++	AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
++	       test "x$ax_pthread_special_flags_added" != "xyes"],
++	      [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
++	       ax_pthread_special_flags_added=yes])
++
++	AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
++	    [ax_cv_PTHREAD_PRIO_INHERIT],
++	    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
++					     [[int i = PTHREAD_PRIO_INHERIT;]])],
++			    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
++			    [ax_cv_PTHREAD_PRIO_INHERIT=no])
++	    ])
++	AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
++	       test "x$ax_pthread_prio_inherit_defined" != "xyes"],
++	      [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
++	       ax_pthread_prio_inherit_defined=yes
++	      ])
++
++	CFLAGS="$ax_pthread_save_CFLAGS"
++	LIBS="$ax_pthread_save_LIBS"
++
++	# More AIX lossage: compile with *_r variant
++	if test "x$GCC" != "xyes"; then
++	    case $host_os in
++		aix*)
++		AS_CASE(["x/$CC"],
++		    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
++		    [#handle absolute path differently from PATH based program lookup
++		     AS_CASE(["x$CC"],
++			 [x/*],
++			 [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
++			 [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
++		;;
++	    esac
++	fi
++fi
++
++test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
++
++AC_SUBST([PTHREAD_LIBS])
++AC_SUBST([PTHREAD_CFLAGS])
++AC_SUBST([PTHREAD_CC])
++
++# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
++if test "x$ax_pthread_ok" = "xyes"; then
++	ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
++	:
++else
++	ax_pthread_ok=no
++	$2
++fi
++AC_LANG_POP
++])dnl AX_PTHREAD

packages/addons/addon-depends/qt/package.mk

@@ -0,0 +1,107 @@
+################################################################################
+#      This file is part of LibreELEC - http://www.libreelec.tv
+#      Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+#
+#  LibreELEC 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.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="qt"
+PKG_VERSION="4.8.7"
+PKG_LICENSE="OSS"
+PKG_SITE="http://qt-project.org"
+PKG_URL="http://download.qt-project.org/official_releases/qt/4.8/${PKG_VERSION}/qt-everywhere-opensource-src-${PKG_VERSION}.tar.gz"
+PKG_SOURCE_DIR="qt-everywhere-opensource-src-${PKG_VERSION}"
+PKG_DEPENDS_TARGET="toolchain Python zlib:host zlib"
+PKG_SHORTDESC="Qt GUI toolkit"
+PKG_LONGDESC="Qt GUI toolkit"
+
+QMAKE_CONF_DIR="mkspecs/qws/linux-openelec-g++"
+QMAKE_CONF="${QMAKE_CONF_DIR}/qmake.conf"
+
+
+PKG_CONFIGURE_OPTS_TARGET="-prefix /usr \
+                           -hostprefix $SYSROOT_PREFIX \
+                           -xplatform qws/linux-openelec-g++ \
+                           -make libs \
+                           -force-pkg-config \
+                           -release \
+                           -opensource -confirm-license \
+                           -static \
+                           -fast \
+                           -no-accessibility \
+                           -no-sql-mysql -no-sql-sqlite \
+                           -no-qt3support \
+                           -no-xmlpatterns \
+                           -no-multimedia \
+                           -no-audio-backend \
+                           -no-phonon -no-phonon-backend \
+                           -no-svg \
+                           -no-webkit \
+                           -no-javascript-jit \
+                           -no-script \
+                           -no-scripttools \
+                           -no-declarative -no-declarative-debug \
+                           -no-neon \
+                           -system-zlib \
+                           -no-gif \
+                           -no-libtiff \
+                           -no-libpng \
+                           -no-libmng \
+                           -no-libjpeg \
+                           -no-openssl \
+                           -no-rpath \
+                           -silent \
+                           -optimized-qmake \
+                           -no-nis \
+                           -no-cups \
+                           -no-pch \
+                           -no-dbus \
+                           -reduce-relocations \
+                           -reduce-exports \
+                           -no-separate-debug-info \
+                           -no-fontconfig \
+                           -no-glib \
+                           -embedded $TARGET_ARCH"
+
+configure_target() {
+  cd ..
+  mkdir -p $QMAKE_CONF_DIR
+  echo "include(../../common/linux.conf)" > $QMAKE_CONF
+  echo "include(../../common/gcc-base-unix.conf)" >> $QMAKE_CONF
+  echo "include(../../common/g++-unix.conf)" >> $QMAKE_CONF
+  echo "include(../../common/qws.conf)" >> $QMAKE_CONF
+  echo "QMAKE_CC = $CC" >> $QMAKE_CONF
+  echo "QMAKE_CXX = $CXX" >> $QMAKE_CONF
+  echo "QMAKE_LINK = $CXX" >> $QMAKE_CONF
+  echo "QMAKE_LINK_SHLIB = $CXX" >> $QMAKE_CONF
+  echo "QMAKE_AR = $AR cqs" >> $QMAKE_CONF
+  echo "QMAKE_OBJCOPY = $OBJCOPY" >> $QMAKE_CONF
+  echo "QMAKE_STRIP = $STRIP" >> $QMAKE_CONF
+  echo "QMAKE_CFLAGS = $CFLAGS" >> $QMAKE_CONF
+  echo "QMAKE_CXXFLAGS = $CXXFLAGS" >> $QMAKE_CONF
+  echo "QMAKE_LFLAGS = $LDFLAGS" >> $QMAKE_CONF
+  echo "load(qt_config)" >> $QMAKE_CONF
+  echo '#include "../../linux-g++/qplatformdefs.h"' >> $QMAKE_CONF_DIR/qplatformdefs.h
+
+  CC="" CXX="" LD="" RANLIB="" AR="" AS="" CPPFLAGS="" CFLAGS="" LDFLAGS="" CXXFLAGS="" \
+    PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX" \
+    PKG_CONFIG="$ROOT/$TOOLCHAIN/bin/pkg-config" \
+    PKG_CONFIG_PATH="$SYSROOT_PREFIX/usr/lib/pkgconfig" \
+    ./configure $PKG_CONFIGURE_OPTS_TARGET
+}
+
+post_makeinstall_target() {
+  mkdir -p $ROOT/$TOOLCHAIN/bin
+  cp -P $ROOT/$PKG_BUILD/bin/qmake $ROOT/$TOOLCHAIN/bin
+}