config/version: set version to 3.1.7

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

.gitignore

@@ -9,28 +9,20 @@
 # prebuild target binarys to provide
 /target/
 
+# scripts for getting and packing source packages
+/tools/mkpkg/*
+!/tools/mkpkg/mkpkg_*
+
 # mkpkg temp
 mkpkg-temp
 
-# options
-/.libreelec
-
 # private working directory
 /.work/
 
-# dedicated filesystem
-/lost+found/
-
 # symlinks...
 /sources
 /.work
 
-# ccache
-/.ccache/
-
 # backup files
 *.orig
 
-# crap
-.DS_Store
-.directory

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "packages/unofficial"]
+	path = packages/unofficial
+	url = https://github.com/OpenELEC/unofficial-addons.git

CHANGELOG

@@ -1,13 +1,3 @@
-LibreELEC CHANGELOG
-==================
+for a changelog see:
 
-To view recent changes/commits to the project (master branch) please visit:
-
-https://github.com/LibreELEC/LibreELEC.tv/commits/master
-
-To compare commits between versions use a formatted URL like:
-
-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
-LibreELEC website forums or IRC support channel.
+https://github.com/OpenELEC/OpenELEC.tv/commits/openelec-3.2

CONTRIBUTING.md

@@ -1,54 +1,38 @@
-### Questions about LibreELEC?
+## Questions about OpenELEC?
 
-To get your questions answered, please ask in the LibreELEC [Forum], on IRC: 
-\#libreelec on Libera.Chat. 
+To get your questions answered, please ask in the OpenELEC [Forum], on IRC: 
+#openelec on freenode.net, or [webchat]. 
 
 Do not open an issue.
 
-### Issue Reports
+## Issue Reports
 
-**BEFORE you report a bug make sure you got the latest testing version of 
-LibreELEC. Your bug might be already fixed.**
-
-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
+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
 a bug, an issue can always be opened later.
 
-If you are sure that it's a bug in LibreELEC and you have not found a [similar issue], open a new [issue]
+If you are sure that it's a bug in OpenELEC 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?
 - What happened instead?
 
-**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.**
+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 LibreELEC you are using.
-- LibreELEC version
-- LibreELEC build
-- LibreELEC arch
+Make sure to specify which version of OpenELEC you are using.
+- OpenELEC version
+- OpenELEC build
+- OpenELEC 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 LibreELEC.
+particular feature into OpenELEC.
 
-Please dont ask us to add 3rdparty drivers unless you are the maintainer/developer of the driver,
-we have no manpower to support a non-mainlined kernel driver for your hardware.
-However, 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.
-
-### Reporting build failures
-
-As buildsystem / core packages (toolchain) / random libraries change from time to time, it is required
-that you always do a clean build (make clean) before reporting build failures. Also make sure that you
-have a clean, unmodified git clone, we can't fix bugs caused by you failed to merge / rebase on
-your own fork.
-
-### Pull Requests
+## Pull Requests
 
 - **Create topic branches**. Don't ask us to pull from your master branch.
 
@@ -66,11 +50,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>/LibreELEC.tv.git
+   git clone git@github.com:<your username>/OpenELEC.tv.git
    # navigate to the newly cloned directory
-   cd LibreELEC.tv
+   cd OpenELEC.tv
    # assign the original repo to a remote called "upstream"
-   git remote add upstream https://github.com/LibreELEC/LibreELEC.tv.git
+   git remote add upstream https://github.com/OpenELEC/OpenELEC.tv.git
    ```
 
 - If you cloned a while ago, get the latest changes from upstream:
@@ -104,7 +88,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]: https://forum.libreelec.tv/
-[issue]: https://github.com/LibreELEC/LibreELEC.tv/issues
-[logfiles]: https://wiki.libreelec.tv/index.php?title=LibreELEC_FAQ#Support_Logs
-[similar issue]: https://github.com/LibreELEC/LibreELEC.tv/search?&ref=cmdform&type=Issues
+[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

Makefile

@@ -1,6 +1,6 @@
 BUILD_DIRS=build.*
 
-all: release
+all: system
 
 system:
 	./scripts/image
@@ -8,17 +8,11 @@ system:
 release:
 	./scripts/image release
 
-image:
-	./scripts/image mkimage
-
 noobs:
 	./scripts/image noobs
 
 clean:
 	rm -rf $(BUILD_DIRS)/* $(BUILD_DIRS)/.stamps
 
-distclean:
-	rm -rf ./.ccache ./$(BUILD_DIRS)
-
 src-pkg:
-	tar cvJf sources.tar.xz sources .stamps
+	tar cvjf sources.tar.bz2 sources .stamps

README.md

@@ -1,19 +1,88 @@
-# LibreELEC
+[OpenELEC](http://www.openelec.tv)
 
-LibreELEC is a 'Just enough OS' Linux distribution for running the award-winning [Kodi](https://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 - Open Embedded Linux Entertainment Center
 
-**Issues & Support**
+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.
 
-Please report issues via the [LibreELEC forum: Bug Reports](https://forum.libreelec.tv/forum-35.html). Please ask support questions in the [LibreELEC forum: Help & Support](https://forum.libreelec.tv/forum-3.html) or ask a member of project staff in the #libreelec IRC channel on Libera.Chat.
+**Source code**
 
-**Donations**
+* https://github.com/OpenELEC/OpenELEC.tv
 
-Contributions towards current project funding goals can be sent via PayPal to donations@libreelec.tv
+**Installation**
+
+* Please read the instructions in our wiki (http://wiki.openelec.tv/index.php?title=Installation) on how to install.
+
+**Known issues**
+
+* Testing snapshot
 
 **License**
 
-LibreELEC original code is released under [GPLv2](https://www.gnu.org/licenses/gpl-2.0.html).
+* 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.
 
 **Copyright**
 
-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. Patches to upstream code have the same license as the upstream project, unless specified otherwise. 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](https://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.
+* 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.
+  Starting with OpenELEC 2.0, SSH is disabled by default but all that is needed
+  is an empty “ssh_enable” file to exist in /storage/.config to enable it.
+* $HOME is mounted on /storage (the second ext4 partition on the drive). 
+  All data transfered to the machine will go here, the rest of the system is
+  read-only with the exception of /var (containing runtime configuration data).
+* 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**

TODO

@@ -0,0 +1,2 @@
+ncurses-5.8/5.9:
+  - segfaults in nano and dialog -> using ncurses-5.7

config/addon/addon.xml

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

config/addon/xbmc.broken.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
-       version="@ADDON_VERSION@"
-       provider-name="@PROVIDER_NAME@">
-  <requires>
-    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
-    <import addon="xbmc.python" version="2.1.0"/>
-@REQUIRES@
-  </requires>
-  <extension point="xbmc.service" library="default.py">
-    <provides>@PKG_ADDON_PROVIDES@</provides>
-  </extension>
-  <extension point="xbmc.addon.metadata">
-    <summary>@PKG_SHORTDESC@</summary>
-    <description>
-@PKG_LONGDESC@
-    </description>
-    <disclaimer>
-@PKG_DISCLAIMER@
-    </disclaimer>
-    <broken>
-@PKG_ADDON_BROKEN@
-    </broken>
-    <platform>all</platform>
-    <news>
-@PKG_ADDON_NEWS@
-    </news>
-    <assets>
-      <icon>resources/icon.png</icon>
-      <fanart>resources/fanart.png</fanart>
-@PKG_ADDON_SCREENSHOT@
-    </assets>
-  </extension>
-</addon>

config/addon/xbmc.python.module.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
-       version="@ADDON_VERSION@"
-       provider-name="@PROVIDER_NAME@">
-  <requires>
-    <import addon="os.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">
-    <summary>@PKG_SHORTDESC@</summary>
-    <description>
-@PKG_LONGDESC@
-    </description>
-    <disclaimer>
-@PKG_DISCLAIMER@
-    </disclaimer>
-    <platform>all</platform>
-    <news>
-@PKG_ADDON_NEWS@
-    </news>
-    <assets>
-      <icon>resources/icon.png</icon>
-      <fanart>resources/fanart.png</fanart>
-@PKG_ADDON_SCREENSHOT@
-    </assets>
-  </extension>
-</addon>

config/addon/xbmc.python.script.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
-       version="@ADDON_VERSION@"
-       provider-name="@PROVIDER_NAME@">
-  <requires>
-    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
-    <import addon="xbmc.python" version="2.1.0"/>
-@REQUIRES@
-  </requires>
-  <extension point="xbmc.python.script" library="default.py">
-    <provides>@PKG_ADDON_PROVIDES@</provides>
-  </extension>
-  <extension point="xbmc.addon.metadata">
-    <summary>@PKG_SHORTDESC@</summary>
-    <description>
-@PKG_LONGDESC@
-    </description>
-    <disclaimer>
-@PKG_DISCLAIMER@
-    </disclaimer>
-    <platform>all</platform>
-    <news>
-@PKG_ADDON_NEWS@
-    </news>
-    <assets>
-      <icon>resources/icon.png</icon>
-      <fanart>resources/fanart.png</fanart>
-@PKG_ADDON_SCREENSHOT@
-    </assets>
-  </extension>
-</addon>

config/addon/xbmc.service.library.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
-       version="@ADDON_VERSION@"
-       provider-name="@PROVIDER_NAME@">
-  <requires>
-    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
-    <import addon="xbmc.python" version="2.1.0"/>
-@REQUIRES@
-  </requires>
-  <extension point="xbmc.service" library="default.py">
-    <provides>@PKG_ADDON_PROVIDES@</provides>
-  </extension>
-  <extension point="xbmc.python.library" library="addon.py">
-    <provides></provides>
-  </extension>
-  <extension point="xbmc.addon.metadata">
-    <summary>@PKG_SHORTDESC@</summary>
-    <description>
-@PKG_LONGDESC@
-    </description>
-    <disclaimer>
-@PKG_DISCLAIMER@
-    </disclaimer>
-    <platform>all</platform>
-    <news>
-@PKG_ADDON_NEWS@
-    </news>
-    <assets>
-      <icon>resources/icon.png</icon>
-      <fanart>resources/fanart.png</fanart>
-@PKG_ADDON_SCREENSHOT@
-    </assets>
-  </extension>
-</addon>

config/addon/xbmc.service.pluginsource.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
-       version="@ADDON_VERSION@"
-       provider-name="@PROVIDER_NAME@">
-  <requires>
-    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
-    <import addon="xbmc.python" version="2.1.0"/>
-@REQUIRES@
-  </requires>
-  <extension point="xbmc.python.pluginsource" library="addon.py">
-    <provides>@PKG_ADDON_PROVIDES@</provides>
-  </extension>
-  <extension point="xbmc.service">
-  </extension>
-  <extension point="xbmc.addon.metadata">
-    <summary>@PKG_SHORTDESC@</summary>
-    <description>
-@PKG_LONGDESC@
-    </description>
-    <disclaimer>
-@PKG_DISCLAIMER@
-    </disclaimer>
-    <platform>all</platform>
-    <news>
-@PKG_ADDON_NEWS@
-    </news>
-    <assets>
-      <icon>resources/icon.png</icon>
-      <fanart>resources/fanart.png</fanart>
-@PKG_ADDON_SCREENSHOT@
-    </assets>
-  </extension>
-</addon>

config/addon/xbmc.service.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
-       version="@ADDON_VERSION@"
-       provider-name="@PROVIDER_NAME@">
-  <requires>
-    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
-    <import addon="xbmc.python" version="2.1.0"/>
-@REQUIRES@
-  </requires>
-  <extension point="xbmc.service" library="default.py">
-    <provides>@PKG_ADDON_PROVIDES@</provides>
-  </extension>
-  <extension point="xbmc.addon.metadata">
-    <summary>@PKG_SHORTDESC@</summary>
-    <description>
-@PKG_LONGDESC@
-    </description>
-    <disclaimer>
-@PKG_DISCLAIMER@
-    </disclaimer>
-    <platform>all</platform>
-    <news>
-@PKG_ADDON_NEWS@
-    </news>
-    <assets>
-      <icon>resources/icon.png</icon>
-      <fanart>resources/fanart.png</fanart>
-@PKG_ADDON_SCREENSHOT@
-    </assets>
-  </extension>
-</addon>

config/arch.aarch64

@@ -1,28 +0,0 @@
-# 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_EXTRA_FLAGS="-mcpu=${TARGET_CPU}${TARGET_CPU_FLAGS}"
-      TARGET_FEATURES+=" neon"
-      ;;
-  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 -mtune=$TARGET_CPU $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

@@ -27,38 +27,28 @@
     arm1176jzf-s)
       TARGET_SUBARCH=armv6zk
       TARGET_ABI=eabi
-      TARGET_EXTRA_FLAGS="-mcpu=$TARGET_CPU"
+      TARGET_EXTRA_FLAGS="-Wno-psabi -Wa,-mno-warn-deprecated"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
+      SIMD_SUPPORT="no"
       ;;
-    cortex-a7|cortex-a15|cortex-a17|cortex-a15.cortex-a7|cortex-a17.cortex-a7)
-      TARGET_SUBARCH=armv7ve
-      TARGET_ABI=eabi
-      TARGET_EXTRA_FLAGS="-mcpu=$TARGET_CPU"
-      TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
-      TARGET_FEATURES+=" neon"
-      ;;
-    cortex-a5|cortex-a8|cortex-a9)
+    cortex-a8)
       TARGET_SUBARCH=armv7-a
       TARGET_ABI=eabi
-      TARGET_EXTRA_FLAGS="-mcpu=$TARGET_CPU"
+      TARGET_EXTRA_FLAGS="-Wno-psabi -Wa,-mno-warn-deprecated"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
-      TARGET_FEATURES+=" neon"
+      SIMD_SUPPORT="yes"
       ;;
-    cortex-a53|cortex-a72.cortex-a53)
-      TARGET_SUBARCH=armv8-a
+    cortex-a9)
+      TARGET_SUBARCH=armv7-a
       TARGET_ABI=eabi
-      TARGET_EXTRA_FLAGS="-mcpu=${TARGET_CPU}"
+      TARGET_EXTRA_FLAGS="-Wno-psabi -Wa,-mno-warn-deprecated"
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
-      TARGET_FEATURES+=" neon"
+      SIMD_SUPPORT="yes"
       ;;
   esac
 
-  TARGET_VARIANT="${TARGET_SUBARCH}${TARGET_CPU_FLAGS}"
-  TARGET_GCC_ARCH=${TARGET_SUBARCH/-}
-  TARGET_KERNEL_ARCH=${TARGET_KERNEL_ARCH:-arm}
-
 # setup ARCH specific *FLAGS
-  TARGET_CFLAGS="-march=$TARGET_VARIANT -mtune=$TARGET_CPU -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated $TARGET_EXTRA_FLAGS"
+  TARGET_CFLAGS="-march=$TARGET_SUBARCH -mcpu=$TARGET_CPU -mabi=aapcs-linux $TARGET_EXTRA_FLAGS"
   [ -n "$TARGET_FPU" ] && TARGET_CFLAGS="$TARGET_CFLAGS $TARGET_FPU_FLAGS"
-  TARGET_LDFLAGS="-march=$TARGET_VARIANT -mtune=$TARGET_CPU"
+  TARGET_LDFLAGS="-march=$TARGET_SUBARCH -mtune=$TARGET_CPU"
   GCC_OPTS="--with-abi=aapcs-linux --with-arch=$TARGET_SUBARCH --with-float=$TARGET_FLOAT --with-fpu=$TARGET_FPU"

config/arch.i386

@@ -0,0 +1,14 @@
+# 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,12 +6,9 @@
 # determine architecture's family
   TARGET_SUBARCH=x86_64
 
-  TARGET_GCC_ARCH="${TARGET_SUBARCH/-/}"
-  TARGET_KERNEL_ARCH=x86
-
 # setup ARCH specific *FLAGS
-  TARGET_CFLAGS="-march=$TARGET_CPU -m64 -mmmx -msse -msse2 -mfpmath=sse"
+  TARGET_CFLAGS="-march=$TARGET_CPU -m64"
   TARGET_LDFLAGS="-march=$TARGET_CPU -m64"
 
 # build with SIMD support ( yes / no )
-  TARGET_FEATURES+=" mmx sse sse2"
+  SIMD_SUPPORT="yes"

config/docker/changelog.txt

@@ -1,2 +0,0 @@
-100
-- Initial addon

config/docker/package.mk

@@ -1,30 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="@NAME@"
-PKG_VERSION="@VERSION@" # Update bin/docker.@NAME@ accordingly
-PKG_REV="100"
-PKG_ARCH="@ARCH@"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_SECTION="docker"
-PKG_SITE=""
-PKG_SHORTDESC=""
-PKG_LONGDESC=""
-
-PKG_IS_ADDON="yes"
-PKG_ADDON_NAME=" (@IMAGE@:$PKG_VERSION)"
-PKG_ADDON_PROJECTS="@PROJECTS@"
-PKG_ADDON_REQUIRES="service.system.docker:0.0.0"
-PKG_ADDON_TYPE="xbmc.service"
-
-make_target() {
-  : #
-}
-
-makeinstall_target() {
-  : #
-}
-
-addon() {
-  : #
-}

config/docker/source/bin/docker

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-name="$(basename $0)"
-. /etc/profile
-oe_setup_addon "$name"
-
-docker rm "$name" 2>/dev/null
-docker run --name="$name" \

config/docker/source/default.py

@@ -1,20 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-import subprocess
-import xbmc
-import xbmcaddon
-
-
-class Monitor(xbmc.Monitor):
-
-   def __init__(self, *args, **kwargs):
-      xbmc.Monitor.__init__(self)
-      self.id = xbmcaddon.Addon().getAddonInfo('id')
-
-   def onSettingsChanged(self):
-      subprocess.call(['systemctl', 'restart', self.id])
-
-
-if __name__ == '__main__':
-   Monitor().waitForAbort()

config/docker/source/resources/language/English/strings.po

@@ -1,10 +0,0 @@
-msgid ""
-msgstr ""
-
-msgctxt "#30000"
-msgid "Configuration"
-msgstr ""
-
-msgctxt "#30001"
-msgid "Note: Kodi remote sources can not be used as Docker volume host sources"
-msgstr ""

config/docker/source/resources/settings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings>
-   <category   label="30000">
-      <setting label="30001" type="lsep" />
-@SETTINGS@   </category>
-</settings>

config/docker/source/system.d/docker.service

@@ -1,14 +0,0 @@
-[Unit]
-Description=%p container
-Requires=service.system.docker.service
-After=service.system.docker.service
-
-[Service]
-Restart=always
-RestartSec=10s
-TimeoutStartSec=0
-ExecStart=/bin/sh /storage/.kodi/addons/%p/bin/%p
-ExecStop=/storage/.kodi/addons/service.system.docker/bin/docker kill %p
-
-[Install]
-WantedBy=multi-user.target

config/graphic

@@ -1,130 +1,121 @@
-if [ "${OPENGL}" = no ]; then
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
+  SDL_SUPPORT="yes"
+else
+  SDL_SUPPORT="no"
+fi
+
+if [ "$OPENGL" = no ]; then
   OPENGL_SUPPORT="no"
 else
   OPENGL_SUPPORT="yes"
 fi
 
-if [ "${OPENGLES}" = no ]; then
+if [ "$OPENGLES" = no ]; then
   OPENGLES_SUPPORT="no"
 else
   OPENGLES_SUPPORT="yes"
 fi
 
+if [ "$SDL_SUPPORT" = no ]; then
+  JOYSTICK_SUPPORT="no"
+fi
+
+if [ "$OPENGL_SUPPORT" = no ]; then
+  XBMC_SCR_RSXS="no"
+  XBMC_VIS_PROJECTM="no"
+  XBMC_VIS_GOOM="no"
+fi
+
 get_graphicdrivers() {
-
-  # set defaults
-  GALLIUM_DRIVERS=""
-  DRI_DRIVERS=""
-  XORG_DRIVERS=""
-  LLVM_SUPPORT="no"
-  COMPOSITE_SUPPORT="no"
-  VDPAU_SUPPORT="no"
-  VAAPI_SUPPORT="no"
-  V4L2_SUPPORT="no"
-
-  if [ "${GRAPHIC_DRIVERS}" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeonsi nvidia nvidia-legacy vmware virtio vc4"
+  if [ "$GRAPHIC_DRIVERS" = "all" ]; then
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx fglrx-legacy nvidia vmware virtualbox"
   fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "etnaviv"; then
-    GALLIUM_DRIVERS+=" etnaviv imx"
-    V4L2_SUPPORT="yes"
-    VAAPI_SUPPORT="no"
-    VDPAU_SUPPORT="no"
-  fi
+  for drv in $GRAPHIC_DRIVERS; do
+    if [ "$drv" = "dove" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS dove"
+    fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "freedreno"; then
-    GALLIUM_DRIVERS+=" freedreno"
-    V4L2_SUPPORT="yes"
-    VAAPI_SUPPORT="no"
-    VDPAU_SUPPORT="no"
-  fi
+    if [ "$drv" = "fglrx" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS fglrx"
+      COMPOSITE_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
+    fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "i915"; then
-    DRI_DRIVERS+=" i915"
-    XORG_DRIVERS+=" intel"
-    COMPOSITE_SUPPORT="yes"
-    VAAPI_SUPPORT="yes"
-  fi
+    if [ "$drv" = "fglrx-legacy" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS fglrx-legacy"
+      COMPOSITE_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
+    fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "i965"; then
-    DRI_DRIVERS+=" i965"
-    XORG_DRIVERS+=" intel"
-    COMPOSITE_SUPPORT="yes"
-    VAAPI_SUPPORT="yes"
-  fi
+    if [ "$drv" = "i915" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,i915"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
+      XORG_DRIVERS="$XORG_DRIVERS intel"
+      COMPOSITE_SUPPORT="yes"
+#      LLVM_SUPPORT="yes"
+    fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "lima"; then
-    GALLIUM_DRIVERS+=" kmsro lima"
-    V4L2_SUPPORT="yes"
-  fi
+    if [ "$drv" = "i965" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,i965"
+      XORG_DRIVERS="$XORG_DRIVERS intel"
+      COMPOSITE_SUPPORT="yes"
+    fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "nvidia"; then
-    XORG_DRIVERS+=" nvidia"
-    VDPAU_SUPPORT="yes"
-  fi
+    if [ "$drv" = "nouveau" ]; then
+#      DRI_DRIVERS="$DRI_DRIVERS,nouveau"
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
+      XORG_DRIVERS="$XORG_DRIVERS nouveau"
+#      LLVM_SUPPORT="yes"
+    fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "nvidia-legacy"; then
-    XORG_DRIVERS+=" nvidia-legacy"
-    VDPAU_SUPPORT="yes"
-  fi
+    if [ "$drv" = "nvidia" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS nvidia"
+      XINERAMA_SUPPORT="yes"
+    fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "panfrost"; then
-    GALLIUM_DRIVERS+=" kmsro panfrost"
-    V4L2_SUPPORT="yes"
-  fi
+    if [ "$drv" = "nvidia-legacy" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
+      XINERAMA_SUPPORT="yes"
+    fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "r200"; then
-    DRI_DRIVERS+=" r200"
-    XORG_DRIVERS+=" ati"
-    COMPOSITE_SUPPORT="yes"
-  fi
+    if [ "$drv" = "virtualbox" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,swrast"
+      XORG_DRIVERS="$XORG_DRIVERS virtualbox"
+      XINERAMA_SUPPORT="yes"
+    fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "r300"; then
-    GALLIUM_DRIVERS+=" r300"
-    XORG_DRIVERS+=" ati"
-    LLVM_SUPPORT="yes"
-    COMPOSITE_SUPPORT="yes"
-    VDPAU_SUPPORT="yes"
-  fi
+    if [ "$drv" = "omapfb" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,swrast"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
+      XORG_DRIVERS="$XORG_DRIVERS ompafb"
+#      LLVM_SUPPORT="yes"
+    fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "r600"; then
-    GALLIUM_DRIVERS+=" r600"
-    XORG_DRIVERS+=" ati"
-    LLVM_SUPPORT="yes"
-    COMPOSITE_SUPPORT="yes"
-    VDPAU_SUPPORT="yes"
-    VAAPI_SUPPORT="yes"
-  fi
+    if [ "$drv" = "r200" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,r200"
+      XORG_DRIVERS="$XORG_DRIVERS ati"
+    fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "radeonsi"; then
-    GALLIUM_DRIVERS+=" radeonsi"
-    XORG_DRIVERS+=" ati amdgpu"
-    LLVM_SUPPORT="yes"
-    COMPOSITE_SUPPORT="yes"
-    VDPAU_SUPPORT="yes"
-    VAAPI_SUPPORT="yes"
-  fi
+    if [ "$drv" = "r300" ]; then
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
+      XORG_DRIVERS="$XORG_DRIVERS ati"
+      LLVM_SUPPORT="yes"
+    fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "vc4"; then
-    GALLIUM_DRIVERS+=" vc4 v3d kmsro"
-    V4L2_SUPPORT="yes"
-    VAAPI_SUPPORT="no"
-    VDPAU_SUPPORT="no"
-  fi
+    if [ "$drv" = "r600" ]; then
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
+      XORG_DRIVERS="$XORG_DRIVERS ati"
+      LLVM_SUPPORT="yes"
+    fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "virtio"; then
-    GALLIUM_DRIVERS+=" virgl"
-  fi
+    if [ "$drv" = "vmware" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,swrast"
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga"
+      XORG_DRIVERS="$XORG_DRIVERS vmware"
+      XINERAMA_SUPPORT="yes"
+#      LLVM_SUPPORT="yes"
+    fi
 
-  if listcontains "${GRAPHIC_DRIVERS}" "vmware"; then
-    GALLIUM_DRIVERS+=" svga"
-    XORG_DRIVERS+=" vmware"
-    COMPOSITE_SUPPORT="yes"
-  fi
-
-  # remove duplicate entries
-  GALLIUM_DRIVERS="$(echo ${GALLIUM_DRIVERS} | xargs -n1 | sort -u | xargs)"
-  XORG_DRIVERS="$(echo ${XORG_DRIVERS} | xargs -n1 | sort -u | xargs)"
-  DRI_DRIVERS="$(echo ${DRI_DRIVERS} | xargs -n1 | sort -u | xargs)"
+  done
 }

config/issue

@@ -0,0 +1 @@
+Welcome to OpenELEC - the powerful Mediacenter4you

config/multithread

@@ -1,165 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
-
-THREADCOUNT=${THREADCOUNT:-100%}
-
-# This function is passed a list of package.mk paths to be processed.
-# Each package.mk is sourced with relevant variables output in JSON format.
-json_worker() {
-  local packages="$@"
-  local pkgpath hierarchy exited
-
-  exit() { exited=1; }
-
-  . config/options ""
-
-  for pkgpath in ${packages}; do
-    pkgpath="${pkgpath%%@*}"
-
-    exited=0
-    if ! source_package "${pkgpath}/package.mk" &>/dev/null; then
-      unset -f exit
-      die "$(print_color CLR_ERROR "FAILURE: sourcing package ${pkgpath}/package.mk")"
-    fi
-
-    [ ${exited} -eq 1 ] && continue
-
-    [[ ${pkgpath} =~ ^${ROOT}/${PACKAGES}/ ]] && hierarchy="global" || hierarchy="local"
-
-    cat <<EOF
-  {
-    "name": "${PKG_NAME}",
-    "hierarchy": "${hierarchy}",
-    "section": "${PKG_SECTION}",
-    "bootstrap": "${PKG_DEPENDS_BOOTSTRAP}",
-    "init": "${PKG_DEPENDS_INIT}",
-    "host": "${PKG_DEPENDS_HOST}",
-    "target": "${PKG_DEPENDS_TARGET}"
-  },
-EOF
-  done
-}
-export -f json_worker
-
-# This function is passed the build instruction for a single job.
-# The function will run either "build <package>" or "install <package>".
-# ${slot} is the job slot number, ie. 1-8 when THREADCOUNT=8.
-# ${job} is the sequence within the total number of ${jobs}.
-package_worker() {
-  local slot=$1 job=$2 jobs=$3 args="$4"
-  local task pkgname result status
-  local addon istarget isaddon
-
-  export MTJOBID=${slot} MTMAXJOBS=${jobs}
-
-  read -r task pkgname <<< "${args}"
-
-  . config/options "${pkgname}"
-
-  [ ! -f "${THREAD_CONTROL}/parallel.pid" ] && echo "${PARALLEL_PID}" >"${THREAD_CONTROL}/parallel.pid"
-
-  ${SCRIPTS}/${task} ${pkgname} 2>&1 && result=0 || result=1
-
-  [[ ${pkgname} =~ :target$ || "${pkgname//:/}" = "${pkgname}" ]] && istarget="yes" || istarget="no"
-
-  [[ "${MTADDONBUILD}" = "yes" && ( "${PKG_IS_ADDON}" = "yes" || "${PKG_IS_ADDON}" = "embedded" ) ]] && isaddon="yes" || isaddon="no"
-
-  if [ "${isaddon}" = "yes" -a "${istarget}" = "yes" ]; then
-    if [ ${result} -eq 0 ]; then
-      ${SCRIPTS}/install_addon ${pkgname} 2>&1 && result=0 || result=1
-    fi
-
-    if [ ${result} -ne 0 ]; then
-      if [ -d "${THREAD_CONTROL}/logs" ]; then
-        echo "${PKG_NAME} ${THREAD_CONTROL}/logs/${job}/stdout" >>"${THREAD_CONTROL}/addons.failed"
-      else
-        echo "${PKG_NAME}" >>"${THREAD_CONTROL}/addons.failed"
-      fi
-    fi
-  fi
-
-  (
-    flock --exclusive 95
-    [ ${result} -eq 0 ] && status="DONE" || status="FAIL"
-    num=$(< "${THREAD_CONTROL}/progress")
-    mv "${THREAD_CONTROL}/progress" "${THREAD_CONTROL}/progress.prev"
-    num=$((num + 1))
-    echo ${num} >"${THREAD_CONTROL}/progress"
-    printf "[%0*d/%0*d] [%-4s] %-7s %s\n" ${#jobs} ${num} ${#jobs} ${jobs} "${status}" "${task}" "${pkgname}" >&2
-  ) 95>"${THREAD_CONTROL}/locks/.progress"
-
-  if [ ${result} -eq 0 ]; then
-    pkg_lock_status "IDLE"
-  else
-    pkg_lock_status "FAILED" "${pkgname}" "${task}"
-
-    print_color CLR_ERROR "FAILURE: $SCRIPTS/${task} ${pkgname} has failed!\n"
-
-    if [ -d "${THREAD_CONTROL}/logs" ]; then
-      cat >&2 <<EOF
-
-The following logs for this failure are available:
-  stdout: ${THREAD_CONTROL}/logs/${job}/stdout
-  stderr: ${THREAD_CONTROL}/logs/${job}/stderr
-
-EOF
-    fi
-  fi
-
-  return ${result}
-}
-export -f package_worker
-
-start_multithread_build() {
-  local singlethread buildopts result=0
-
-  # init thread control folder
-  rm -rf "${THREAD_CONTROL}"
-  mkdir -p "${THREAD_CONTROL}/locks"
-  echo -1 >"${THREAD_CONTROL}/progress.prev"
-  echo 0 >"${THREAD_CONTROL}/progress"
-  echo 0 >"${THREAD_CONTROL}/status.max"
-  touch "${THREAD_CONTROL}/status"
-
-  # Increase file descriptors if building one thread/package
-  [ "${THREADCOUNT}" = "0" ] && ulimit -n ${ULIMITN:-10240}
-
-  # Bootstrap GNU parallel
-  MTWITHLOCKS=no $SCRIPTS/build parallel:host 2>&1 || die "Unable to bootstrap parallel package"
-
-  # determine number of available slots for the given THREADCOUNT - optimise logging for single threaded builds
-  [ $(seq 1 32 | ${TOOLCHAIN}/bin/parallel --plain --no-notice --max-procs ${THREADCOUNT} echo {%} | sort -n | tail -1) -eq 1 ] && singlethread=yes || singlethread=no
-
-  # create a single log file by default for a single threaded build (or the builder is a masochist)
-  if [ "${singlethread}" = "yes" -a "${ONELOG,,}" != "no" ] || [ "${ONELOG,,}" = "yes" ]; then
-    buildopts+=" --ungroup"
-  else
-    mkdir -p "${THREAD_CONTROL}/logs"
-    buildopts+=" --group --results ${THREAD_CONTROL}/logs/{#}/"
-  fi
-
-  # When building addons, don't halt on error - keep building all packages/addons
-  [ "${MTADDONBUILD}" = "yes" ] && buildopts+=" --halt never" || buildopts+=" --halt now,fail=1"
-
-  # pipefail: return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status
-  set -o pipefail
-
-  cat ${_CACHE_PACKAGE_GLOBAL} ${_CACHE_PACKAGE_LOCAL} | \
-    ${TOOLCHAIN}/bin/parallel --plain --no-notice --max-args 30 --halt now,fail=1 json_worker | \
-    ${SCRIPTS}/genbuildplan.py --no-reorder --show-wants --build ${@} > "${THREAD_CONTROL}"/plan || result=1
-
-  if [ ${result} -eq 0 ]; then
-    save_build_config
-
-    cat "${THREAD_CONTROL}"/plan | awk '{print $1 " " $2}' | \
-      MTBUILDSTART=$(date +%s) MTWITHLOCKS=yes ${TOOLCHAIN}/bin/parallel \
-        --plain --no-notice --max-procs ${THREADCOUNT} --joblog="${THREAD_CONTROL}/joblog" --plus ${buildopts} \
-        package_worker {%} {#} {##} {} || result=1
-
-    rm -f "${THREAD_CONTROL}/parallel.pid"
-  fi
-
-  set +o pipefail
-
-  return ${result}
-}

config/noobs/os.json

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

config/noobs/partition_setup.sh

@@ -1,30 +1,46 @@
 #!/bin/sh -x
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2013 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
+################################################################################
 
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-
-MOUNTPOINT="/tmp/LibreELEC-System"
+MOUNTPOINT="/tmp/OpenELEC-System"
 
 md5sumCheck() {
   ( cd $MOUNTPOINT
     echo "checking MD5: $1"
     md5sum -c $1.md5
     if [ "$?" = "1" ]; then
-      echo "#######################################################"
-      echo "#                                                     #"
-      echo "# LibreELEC failed md5 check - Installation will quit #"
-      echo "#                                                     #"
-      echo "#    Your original download was probably corrupt.     #"
-      echo "#   Please visit libreelec.tv and get another copy    #"
-      echo "#                                                     #"
-      echo "#######################################################"
+      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 "######################################################"
       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,20 +1,20 @@
 {
   "partitions": [
     {
-      "label":                     "System",
-      "filesystem_type":           "FAT",
-      "partition_size_nominal":    @SYSTEM_SIZE@,
-      "want_maximised":            false,
-      "uncompressed_tarball_size": 120,
-      "mkfs_options":              ""
+      "label": "System",
+      "filesystem_type": "FAT",
+      "partition_size_nominal: "128",
+      "want_maximised": "false",
+      "uncompressed_tarball_size": 128,
+      "mkfs_options": ""
     },
     {
-      "label":                     "Storage",
-      "filesystem_type":           "ext4",
-      "partition_size_nominal":    512,
-      "want_maximised":            true,
-      "uncompressed_tarball_size": 10,
-      "mkfs_options":              ""
+      "label": "Storage",
+      "filesystem_type": "ext4",
+      "partition_size_nominal: "864",
+      "want_maximised": "true",
+      "uncompressed_tarball_size": 512,
+      "mkfs_options": ""
     }
-  ]
+  ],
 }

config/optimize

@@ -1,95 +1,91 @@
-GCC_OPTIM="-Os"
-# Linker hash-style is set to gnu via gcc default
-LD_OPTIM="-Wl,--as-needed"
+if [ "$OPTIMIZATIONS" = fast ];then
+  GCC_OPTIM="-Ofast"
+  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
+  LD_OPTIM="-Wl,--as-needed"
+fi
 
-if [ "${BUILD_WITH_DEBUG}" = "yes" ]; then
+if [ "$OPTIMIZATIONS" = speed ];then
+  GCC_OPTIM="$GCC_OPTIM -O3"
+  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
+  GCC_OPTIM="$GCC_OPTIM -ffast-math"
+  LD_OPTIM="-Wl,--as-needed"
+fi
+
+if [ "$OPTIMIZATIONS" = normal ];then
+  GCC_OPTIM="$GCC_OPTIM -O2"
+  LD_OPTIM=""
+fi
+
+if [ "$OPTIMIZATIONS" = size ];then
+  GCC_OPTIM="$GCC_OPTIM -Os"
+  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
+  GCC_OPTIM="$GCC_OPTIM -ffast-math"
+  LD_OPTIM="-Wl,--as-needed"
+fi
+
+if [ "$LTO_SUPPORT" = yes ];then
+  GCC_OPTIM="$GCC_OPTIM -flto"
+  LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
+  LD_OPTIM="$LD_OPTIM -flto"
+fi
+
+if [ "$GOLD_SUPPORT" = yes ];then
+  LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
+fi
+
+if [ "$DEBUG" = yes ]; then
   TARGET_CFLAGS="$TARGET_CFLAGS -ggdb"
   TARGET_CXXFLAGS="$TARGET_CXXFLAGS -ggdb"
   TARGET_LDFLAGS="$TARGET_LDFLAGS -ggdb"
 else
   TARGET_CFLAGS="$TARGET_CFLAGS -fomit-frame-pointer"
   TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fomit-frame-pointer"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -s"
 fi
 
-NINJA_OPTS=""
-
-TARGET_CPPFLAGS=""
+TARGET_CPPFLAGS=
 TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
 TARGET_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $GCC_OPTIM"
 TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
 TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
 
 HOST_CPPFLAGS=""
-HOST_CFLAGS="-march=native -O2 -Wall -pipe -I$TOOLCHAIN/include"
+HOST_CFLAGS="-O2 -Wall -pipe -I$ROOT/$TOOLCHAIN/include"
 HOST_CXXFLAGS="$HOST_CFLAGS"
-HOST_LDFLAGS="-Wl,-rpath,$TOOLCHAIN/lib -L$TOOLCHAIN/lib"
-HOST_INCDIR="$TOOLCHAIN/include /usr/include"
-
-# work around Ubuntu default C*FLAGS 
-# see https://wiki.ubuntu.com/ToolChain/CompilerFlags#A-Wformat_-Wformat-security
-HOST_CFLAGS="$HOST_CFLAGS -Wno-format-security"
-HOST_CXXFLAGS="$HOST_CXXFLAGS -Wno-format-security" 
-
-# lto flags
-FLAGS_OPTIM_LTO_NO_PARALLEL="-flto"
-FLAGS_OPTIM_LTO_PARALLEL="-flto=${CONCURRENCY_MAKE_LEVEL}"
-FLAGS_OPTIM_LTO_NO_FAT="-fno-fat-lto-objects"
-FLAGS_OPTIM_LTO_FAT="-ffat-lto-objects"
-FLAGS_OPTIM_LTO_OFF="-fno-lto"
-LDFLAGS_OPTIM_LTO_COMMON="-fuse-linker-plugin"
-
-# gold flags
-LDFLAGS_OPTIM_GOLD="-fuse-ld=gold"
-
-# position-independent code
-CFLAGS_OPTIM_PIC="-fPIC -DPIC"
-CXXFLAGS_OPTIM_PIC="-fPIC -DPIC"
-LDFLAGS_OPTIM_PIC="-fPIC"
-
-# hardening support
-# TODO: basiclly copied from debian 9, should adjust for LE
-CFLAGS_OPTIM_HARDENING="-fstack-protector-strong -Wformat -Werror=format-security -fPIE"
-CXXFLAGS_OPTIM_HARDENING="-fstack-protector-strong -Wformat -Werror=format-security -fPIE"
-CPPFLAGS_OPTIM_HARDENING="-D_FORTIFY_SOURCE=2"
-LDFLAGS_OPTIM_HARDENING="-Wl,-z,relro -Wl,-z,now"
+HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
+HOST_LIBDIR="$ROOT/$TOOLCHAIN/lib"
 
 # add distro specific library dirs
-if [ -z "$HOST_LIBDIR" ]; then
-  HOST_LIBDIR="$TOOLCHAIN/lib"
-
   # ubuntu/debian specific "multiarch support"
-  export MACHINE_HARDWARE_NAME="$(uname -m)"
-  export MACHINE_HARDWARE_PLATFORM="$(uname -i)"
-  FAMILY_TRIPLET=${HOST_NAME/${MACHINE_HARDWARE_NAME}/${MACHINE_HARDWARE_PLATFORM}}
-  if [ -d /lib/$FAMILY_TRIPLET ]; then
-    HOST_LIBDIR="$HOST_LIBDIR /lib/$FAMILY_TRIPLET"
-  fi
-  if [ -d /usr/lib/$FAMILY_TRIPLET ]; then
-    HOST_LIBDIR="$HOST_LIBDIR /usr/lib/$FAMILY_TRIPLET"
-  fi
+    FAMILY_TRIPLET=$(echo $HOST_NAME | sed -e "s,$(uname -m),$(uname -i),")
+    if [ -d /lib/$FAMILY_TRIPLET ]; then
+      HOST_LIBDIR="$HOST_LIBDIR /lib/$FAMILY_TRIPLET"
+    fi
+    if [ -d /usr/lib/$FAMILY_TRIPLET ]; then
+      HOST_LIBDIR="$HOST_LIBDIR /usr/lib/$FAMILY_TRIPLET"
+    fi
 
   # default multiarch support
-  case "${MACHINE_HARDWARE_NAME}" in
-    i*86)
-      if [ -d /lib32 ]; then
-        HOST_LIBDIR="$HOST_LIBDIR /lib32"
-      fi
-      if [ -d /usr/lib32 ]; then
-        HOST_LIBDIR="$HOST_LIBDIR /usr/lib32"
-      fi
-    ;;
-    x86_64)
-      if [ -d /lib64 ]; then
-        HOST_LIBDIR="$HOST_LIBDIR /lib64"
-      fi
-      if [ -d /usr/lib64 ]; then
-        HOST_LIBDIR="$HOST_LIBDIR /usr/lib64"
-      fi
-    ;;
-  esac
+    case "`uname -m`" in
+      i*86)
+        if [ -d /lib32 ]; then
+          HOST_LIBDIR="$HOST_LIBDIR /lib32"
+        fi
+        if [ -d /usr/lib32 ]; then
+          HOST_LIBDIR="$HOST_LIBDIR /usr/lib32"
+        fi
+      ;;
+      x86_64)
+        if [ -d /lib64 ]; then
+          HOST_LIBDIR="$HOST_LIBDIR /lib64"
+        fi
+        if [ -d /usr/lib64 ]; then
+          HOST_LIBDIR="$HOST_LIBDIR /usr/lib64"
+        fi
+      ;;
+    esac
 
   # default dirs
-  export HOST_LIBDIR="$HOST_LIBDIR /lib /usr/lib"
-fi
+    HOST_LIBDIR="$HOST_LIBDIR /lib /usr/lib"
+    HOST_INCDIR="$ROOT/$TOOLCHAIN/include /usr/include"

config/options

@@ -1,115 +1,80 @@
-# Do not build as root. Ever.
-if [[ "${EUID}" -eq 0 ]]; then
-  echo "Building as the root user is NOT supported. Use a regular user account for the build." 1>&2
-  exit 1
-fi
-
-# Spaces in paths are verboten
-if [[ ${PWD} =~ [[:space:]] ]]; then
-  echo "Current PWD: \"${PWD}\"" 1>&2
-  echo 1>&2
-  echo "Building in a folder that includes spaces is NOT supported. Use a folder without spaces." 1>&2
-  exit 1
-fi
-
 # set default language for buildsystem
-export LC_ALL=C
-
-# set default independent variables
-ROOT="${PWD}"
-DISTRO_DIR="${ROOT}/distributions"
-PROJECT_DIR="${ROOT}/projects"
-
-# determines DISTRO, if not forced by user
-DISTRO="${DISTRO:-LibreELEC}"
+  export LC_ALL=C
 
 # determines PROJECT, if not forced by user
-PROJECT="${PROJECT:-Generic}"
-
-# determines TARGET_ARCH, if not forced by user
-ARCH="${ARCH:-x86_64}"
-TARGET_ARCH="${ARCH}"
-
-# include helper functions
-. config/functions
-
-# read DISTRO version information
-. "${DISTRO_DIR}/${DISTRO}/version" || die "\nERROR: No distro version present\n"
-
-# read DISTRO options if available
-if [ -f "${DISTRO_DIR}/${DISTRO}/options" ]; then
-  . "${DISTRO_DIR}/${DISTRO}/options"
+# default is Generic
+if [ -z "$PROJECT" ]; then
+  PROJECT="Generic"
+else
+  PROJECT="$PROJECT"
 fi
 
-# read PROJECT options if available
-if [ -f "${PROJECT_DIR}/${PROJECT}/options" ]; then
-  . "${PROJECT_DIR}/${PROJECT}/options"
+# determines TARGET_ARCH, if not forced by user (i386 / x86_64 / arm)
+# default is i386
+if [ -z "$ARCH" ]; then
+  TARGET_ARCH="i386"
+else
+  TARGET_ARCH="$ARCH"
 fi
 
-# read DEVICE options if available
-if [ -f "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options" ]; then
-  . "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options"
-fi
+ROOT=`pwd`
+PROJECT_DIR="$ROOT/projects"
 
-# projects can set KERNEL_NAME (kernel.img)
-KERNEL_NAME="${KERNEL_NAME:-KERNEL}"
+# include versioning
+  . config/version
 
-LINUX_DEPENDS="${PROJECT_DIR}/${PROJECT}/linux ${PROJECT_DIR}/${PROJECT}/patches/linux ${PROJECT_DIR}/${PROJECT}/packages/linux ${ROOT}/packages/linux"
-[ -n "${DEVICE}" ] && LINUX_DEPENDS+=" ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/linux ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/patches/linux ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/linux"
-[ "${TARGET_ARCH}" = "x86_64" ] && LINUX_DEPENDS+=" ${ROOT}/packages/linux-firmware/intel-ucode ${ROOT}/packages/linux-firmware/kernel-firmware"
+# read project options if available
+ if [ -f "$PROJECT_DIR/$PROJECT/options" ]; then
+   . $PROJECT_DIR/$PROJECT/options
+ fi
+
+# Target system library C (eglibc)
+  TARGET_LIBC="eglibc"
+
+# Library strip
+  LIBSTRIP="yes"
 
 # Need to point to your actual cc
-# If you have ccache installed, take care that LOCAL_CC does not point to it
-[ -z "${LOCAL_CC}" ] && export LOCAL_CC="$(command -v gcc)"
-
-if [ -z "${LOCAL_CC}" ]; then
-  die "***** Please install gcc *****" "127"
-fi
+# If you have ccache installed, take care that LOCAL_CC don't point to it
+  LOCAL_CC=`which gcc`
 
 # Need to point to your actual g++
-# If you have ccache installed, take care that LOCAL_CXX does not point to it
-[ -z "${LOCAL_CXX}" ] && export LOCAL_CXX="$(command -v g++)"
+# If you have ccache installed, take care that LOCAL_CXX don't point to it
+  LOCAL_CXX=`which g++`
+
+# Support C++ in toolchain
+  TOOLCHAIN_CXX="yes"
 
 # verbose compilation mode (yes/no)
-VERBOSE="${VERBOSE:-yes}"
+  VERBOSE="yes"
 
 # Concurrency make level (-j option)
-#  Try values between 1 and number of processor cores present.
-#  default: use all cores
-[ -z "${CONCURRENCY_MAKE_LEVEL}" ] && export CONCURRENCY_MAKE_LEVEL=$(nproc)
+#  Try value 1 (default) to 4 on single CPU computer, or more on
+#  multi-processor computer (like hyperthreading SMP CPU)
+  CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
 
 # cache size for ccache
 # Set the maximum size of the files stored in the cache. You can specify a
 # value in gigabytes, megabytes or kilobytes by appending a G, M or K to the
 # value. The default is gigabytes. The actual value stored is rounded down to
-# the nearest multiple of 16 kilobytes.  Keep in mind this per project .ccache
-# directory.
-CCACHE_CACHE_SIZE="10G"
+# the nearest multiple of 16 kilobytes.
+  CCACHE_CACHE_SIZE="30G"
 
-# read local persistent options from $ROOT if available
-if [ -f "${ROOT}/.libreelec/options" ]; then
-  . "${ROOT}/.libreelec/options"
-fi
+# forcing install of all packages (yes/no)
+  FORCE_INSTALL="no"
 
-# read global persistent options from $HOME if available
-if [ -f "${HOME}/.libreelec/options" ]; then
-  . "${HOME}/.libreelec/options"
-fi
+# install devtools on development builds
+  if [ "$OPENELEC_VERSION" = "devel" ]; then
+    DEVTOOLS=yes
+  fi
 
-# overwrite OEM_SUPPORT via commandline
-if [ "${OEM}" = "yes" -o "${OEM}" = "no" ]; then
-  OEM_SUPPORT="${OEM}"
-fi
-
-check_config
+# read options from $HOME if available
+  if [ -f "$HOME/.openelec/options" ]; then
+    . $HOME/.openelec/options
+  fi
+  if [ -f "$HOME/.openelec/$PROJECT/options" ]; then
+    . $HOME/.openelec/$PROJECT/options
+  fi
 
 . config/graphic
 . config/path $1
-
-## package processing
-
-# If the package caches are unset, then populate them
-init_package_cache
-
-# set package metadata
-source_package "${1}"

config/path

@@ -1,15 +1,12 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
 set -e
 
 # setup initial directorys (relative to root)
   CONFIG=config
   SCRIPTS=scripts
   PACKAGES=packages
-  SOURCES=${SOURCES_DIR:-$ROOT/sources}
+  SOURCES=sources
   BUILD_BASE=build
-  TARGET_IMG=${TARGET_DIR:-$ROOT/target}
+  TARGET=target
   ADDONS=addons
 
 # include ARCH specific options
@@ -17,20 +14,11 @@ set -e
     . config/arch.$TARGET_ARCH
   fi
 
-[ -z "${HOST_NAME}" ] && export HOST_NAME="$($LOCAL_CC -dumpmachine)"
-TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI}
-
-BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-${DEVICE:-$PROJECT}.$TARGET_ARCH-$LIBREELEC_VERSION
-if [ "$LIBREELEC_VERSION" = "devel" ] ; then
-  BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-${DEVICE:-$PROJECT}.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
-fi
-
-if [ -n "$BUILD_SUFFIX" ]; then
-  BUILD=$BUILD-$BUILD_SUFFIX
-fi
-
-THREAD_CONTROL=${BUILD}/.threads
+HOST_NAME=`$LOCAL_CC -dumpmachine`
+TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI}
 
+BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION
+TARGET_IMG=$ROOT/$TARGET
 TARGET_ADDONS="$TARGET_IMG/$ADDONS/$ADDON_PATH"
 ADDON_BUILD="$BUILD/$ADDONS/$1"
 STAMPS_NOARCH=.stamps
@@ -38,30 +26,82 @@ STAMPS=$BUILD/.stamps
 STAMPS_INSTALL=$BUILD/image/.stamps
 DOCS=DOCS
 TOOLCHAIN=$BUILD/toolchain
-SYSROOT_PREFIX=$TOOLCHAIN/$TARGET_NAME/sysroot
+SYSROOT_PREFIX=$ROOT/$TOOLCHAIN/$TARGET_NAME/sysroot
 LIB_PREFIX=$SYSROOT_PREFIX/usr
-TARGET_PREFIX=$TOOLCHAIN/bin/$TARGET_NAME-
+TARGET_PREFIX=$ROOT/$TOOLCHAIN/bin/$TARGET_NAME-
 
-# use ARM toolchain on 64/32 split builds
-if [ -z "$KERNEL_TOOLCHAIN" -a "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
-  KERNEL_TOOLCHAIN="aarch64-linux-gnu"
-fi
-if [ -n "$KERNEL_TOOLCHAIN" ]; then
-  TARGET_KERNEL_PREFIX=$TOOLCHAIN/lib/gcc-arm-$KERNEL_TOOLCHAIN/bin/$KERNEL_TOOLCHAIN-
-else
-  TARGET_KERNEL_PREFIX=$TARGET_PREFIX
-fi
-
-FAKEROOT_SCRIPT=$BUILD/.fakeroot
+FAKEROOT_SCRIPT=$ROOT/.fakeroot.$PROJECT.$TARGET_ARCH
 
 if [ -z "$INSTALL" ]; then
   INSTALL=$BUILD/image/system
 fi
-INSTALL_INIT=$BUILD/image/initramfs/root-image
 
 . config/sources
 
-MAKE="$TOOLCHAIN/bin/make"
+MAKE="$ROOT/$TOOLCHAIN/bin/make"
+MAKEINSTALL="$ROOT/$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX install"
+SED="sed -i"
+
+# set package metadata
+  PKG_NAME="$1"
+  PKG_VERSION="0.0invalid"
+  PKG_REV="0"
+  PKG_ARCH="any"
+  PKG_LICENSE="unknown"
+  PKG_SITE=""
+  PKG_URL=""
+  PKG_DEPENDS=""
+  PKG_BUILD_DEPENDS=""
+  PKG_PRIORITY="optional"
+  PKG_SECTION=""
+  PKG_SHORTDESC="$1 (autogenerated)"
+  PKG_LONGDESC=""
+  PKG_IS_ADDON="no"
+
+  if [ -n "$1" ]; then
+    FOUND=0
+    for DIR in $ROOT/`find $PACKAGES -type d -name $(echo $1| awk -F : '{print $1}') ! -wholename \*\/source\/\* 2>/dev/null` ; do
+      # keep track of dirs with meta for debugging
+      if [ -z "$ALL_DIRS" ] ; then
+        ALL_DIRS="$DIR"
+      else
+        ALL_DIRS="$ALL_DIRS\\n$DIR"
+      fi
+      if [ -f "$DIR/package.mk" -o -f "$DIR/meta" -o -f "$DIR/install" -o -f "$DIR/build" ] ; then
+        FOUND=$((FOUND+1))
+        # found first. set $PKG_DIR
+        PKG_DIR="$DIR"
+        if [ $FOUND -gt 1 ] ; then
+          # found more ? fail
+          echo "Error - multiple package folders:"
+          echo -e "$ALL_DIRS"
+          exit 1
+        fi
+      fi
+    done
+  fi
+
+  if [ -r $PKG_DIR/package.mk ]; then
+    . $PKG_DIR/package.mk
+  elif [ -r $PKG_DIR/meta ]; then
+    . $PKG_DIR/meta
+  fi
+
+  if [ "$PKG_IS_ADDON" = "yes" ] ; then
+    [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
+  fi
+
+  if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}"
+  fi
 
 XORG_PATH_DRI=/usr/lib/dri
 XORG_PATH_XKB=/usr/share/X11/xkb
@@ -70,36 +110,75 @@ 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++
+
+TARGET_CC=${TARGET_PREFIX}gcc
+TARGET_CXX=${TARGET_PREFIX}g++
+TARGET_LD=${TARGET_PREFIX}ld
+TARGET_AS=${TARGET_PREFIX}as
+TARGET_AR=${TARGET_PREFIX}ar
+TARGET_NM=${TARGET_PREFIX}nm
+TARGET_RANLIB=${TARGET_PREFIX}ranlib
+TARGET_OBJCOPY=${TARGET_PREFIX}objcopy
+TARGET_OBJDUMP=${TARGET_PREFIX}objdump
+TARGET_STRIP=${TARGET_PREFIX}strip
+
 . config/optimize
 
+TARGET_PKG_CONFIG_PATH=""
+TARGET_PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
+TARGET_PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
+
+HOST_AWK=gawk
+HOST_CC=$ROOT/$TOOLCHAIN/bin/host-gcc
+HOST_CXX=$ROOT/$TOOLCHAIN/bin/host-g++
+HOST_LD=ld
+HOST_AS=as
+HOST_AR=ar
+HOST_NM=nm
+HOST_RANLIB=ranlib
+HOST_OBJCOPY=objcopy
+HOST_STRIP=strip
+
+HOST_PKG_CONFIG_PATH=""
+HOST_PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig"
+HOST_PKG_CONFIG_SYSROOT_DIR=""
+
 if [ -z "$CCACHE_DIR" ]; then
-  export CCACHE_DIR=$BUILD/.ccache
+    export CCACHE_DIR=$HOME/.ccache-openelec
+fi
+export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL
+export PKG_CONFIG=$ROOT/$TOOLCHAIN/bin/pkg-config
+
+if [ -z "$PATH" -o "$PATH" = "${PATH#$ROOT/$TOOLCHAIN/bin:}" ]; then
+  export PATH="$ROOT/$TOOLCHAIN/bin:$PATH"
 fi
 
-if [[ -z "$PATH" || ( "$PATH" != "$TOOLCHAIN/bin:$TOOLCHAIN/sbin" && "$PATH" = "${PATH#$TOOLCHAIN/bin:$TOOLCHAIN/sbin:}" ) ]]; then
-  export PATH="$TOOLCHAIN/bin:$TOOLCHAIN/sbin${PATH:+":$PATH"}"
+if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$ROOT/$TOOLCHAIN/lib:}" ]; then
+  export LD_LIBRARY_PATH="$ROOT/$TOOLCHAIN/lib:$LD_LIBRARY_PATH"
 fi
 
 VERSION_SUFFIX=$TARGET_ARCH
+. config/functions
+
+check_path
+check_config
+
+setup_toolchain target
 
-# redirect formatted output
-export BUILD_INDENT_SIZE=4
 SILENT_OUT=3
 VERBOSE_OUT=4
-
 if [ "$VERBOSE" = yes ]; then
   exec 3>&1
-  exec 4>&1
+  exec 4>&2
 else
   exec 3>&2
   exec 4>/dev/null
 fi
-
-unset LD_LIBRARY_PATH
+BUILD_INDENT_SIZE=4
 
 # multilib? nah
 unset CONFIG_SITE
-
-# meh suse
-unset PYTHONSTARTUP
-unset PYTHONPATH

config/release/Autorun.inf

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

config/show_config

@@ -1,167 +0,0 @@
-show_config() {
-  # load graphic configuration
-    get_graphicdrivers
-
-  dashes="==========================="
-  config_message="$config_message\n $dashes$dashes$dashes"
-  config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community"))"
-  config_message="$config_message\n $dashes$dashes$dashes"
-
-  # Build options
-
-  config_message="$config_message\n\n Buildoptions:"
-  config_message="$config_message\n $dashes$dashes"
-
-  config_message="$config_message\n - CPU (ARCH):\t\t\t\t $TARGET_CPU ($TARGET_ARCH)"
-  config_message="$config_message\n - FLOAT:\t\t\t\t $TARGET_FLOAT"
-  config_message="$config_message\n - FPU:\t\t\t\t\t $TARGET_FPU"
-  config_message="$config_message\n - CPU features:\t\t\t $TARGET_FEATURES"
-  config_message="$config_message\n - LTO (Link Time Optimization) support: $LTO_SUPPORT"
-  config_message="$config_message\n - GOLD (Google Linker) Support:\t $GOLD_SUPPORT"
-  config_message="$config_message\n - LLVM support:\t\t\t $LLVM_SUPPORT"
-  config_message="$config_message\n - DEBUG:\t\t\t\t ${DEBUG:-no}"
-
-  # config_message="$config_message\n - CFLAGS:\t $TARGET_CFLAGS"
-  # config_message="$config_message\n - LDFLAGS:\t $TARGET_LDFLAGS"
-
-  # Graphic configuration
-
-  config_message="$config_message\n\n Graphic configuration:"
-  config_message="$config_message\n $dashes$dashes"
-
-  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 - uvesafb support:\t\t\t $UVESAFB_SUPPORT"
-
-  # Hardware decoder support
-
-  config_message="$config_message\n\n Hardware decoder configuration:"
-  config_message="$config_message\n $dashes$dashes"
-
-  config_message="$config_message\n - Kodi Player driver:\t\t\t $KODIPLAYER_DRIVER"
-  config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI_SUPPORT"
-  config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU_SUPPORT"
-
-  # Input device configuration
-
-  config_message="$config_message\n\n Input device configuration:"
-  config_message="$config_message\n $dashes$dashes"
-
-  config_message="$config_message\n - Remote support:\t\t\t $REMOTE_SUPPORT"
-  config_message="$config_message\n - CEC Adapter support:\t\t\t $CEC_SUPPORT"
-  config_message="$config_message\n - CEC Framework support:\t\t $CEC_FRAMEWORK_SUPPORT"
-  config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT"
-
-  # Misc. hardware configuration
-
-  config_message="$config_message\n\n Misc. hardware configuration:"
-  config_message="$config_message\n $dashes$dashes"
-
-  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"
-
-  for config_driver in $ADDITIONAL_DRIVERS; do
-    config_message="$config_message\n - Include driver:\t\t\t $config_driver"
-  done
-
-  if [ "$DRIVER_ADDONS_SUPPORT" = "yes" ]; then
-    for config_driver_addons in $DRIVER_ADDONS; do
-      config_message="$config_message\n - Include driver add-ons:\t\t $config_driver_addons"
-    done
-  fi
-
-  for config_firmware in $FIRMWARE; do
-    config_message="$config_message\n - Include firmware:\t\t\t $config_firmware"
-  done
-
-  for config_modules in $INITRAMFS_MODULES; do
-    config_message="$config_message\n - Initramfs modules:\t\t\t $config_modules"
-  done
-
-  # Network service configuration
-
-  config_message="$config_message\n\n Network service configuration:"
-  config_message="$config_message\n $dashes$dashes"
-
-  config_message="$config_message\n - Avahi (Zeroconf) support:\t\t $AVAHI_DAEMON"
-  config_message="$config_message\n - NFS mounting support:\t\t $NFS_SUPPORT"
-  config_message="$config_message\n - SAMBA mounting support:\t\t $SAMBA_SUPPORT"
-  config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER"
-  config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER"
-  config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
-  config_message="$config_message\n - WireGuard support:\t\t\t $WIREGUARD_SUPPORT"
-
-  # OS configuration
-
-  config_message="$config_message\n\n OS configuration:"
-  config_message="$config_message\n $dashes$dashes"
-
-  config_message="$config_message\n - OEM Support:\t\t\t\t $OEM_SUPPORT"
-  config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD"
-  config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER"
-  config_message="$config_message\n - UDevil support:\t\t\t $UDEVIL"
-  config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
-  for config_package in $ADDITIONAL_PACKAGES; do
-    config_message="$config_message\n - Include package:\t\t\t $config_package"
-  done
-
-  # Misc. Filesystems
-
-  config_message="$config_message\n\n Misc. Filesystems:"
-  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
-  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"
-
-  # Kodi configuration
-  if [ ! "$MEDIACENTER" = "no" ]; then
-    config_message="$config_message\n\n Kodi configuration:"
-    config_message="$config_message\n $dashes$dashes"
-
-    config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER"
-    config_message="$config_message\n - Kodi Blu-Ray support:\t\t $KODI_BLURAY_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"
-    config_message="$config_message\n - Kodi NFS support:\t\t\t $KODI_NFS_SUPPORT"
-    config_message="$config_message\n - Kodi MySQL support:\t\t\t $KODI_MYSQL_SUPPORT"
-    config_message="$config_message\n - Kodi Optical Drive support:\t\t $KODI_OPTICAL_SUPPORT"
-    config_message="$config_message\n - Kodi SAMBA client support:\t\t $KODI_SAMBA_SUPPORT"
-    config_message="$config_message\n - Kodi UPNP support:\t\t\t $KODI_UPNP_SUPPORT"
-    config_message="$config_message\n - Kodi Webserver support:\t\t $KODI_WEBSERVER_SUPPORT"
-
-    for config_skin in $SKINS; do
-      config_message="$config_message\n - Include Skin:\t\t\t $config_skin"
-    done
-
-    config_message="$config_message\n - Default Skin:\t\t\t $SKIN_DEFAULT"
-    config_message="$config_message\n - Include extra fonts:\t\t\t $KODI_EXTRA_FONTS"
-  fi
-
-  if [ "$(type -t show_distro_config)" = "function" ]; then
-    show_distro_config
-  fi
-
-  config_message="$config_message\n"
-  config_message="$config_message\n $dashes$dashes$dashes"
-  config_message="$config_message\n End Configuration for $DISTRONAME"
-  config_message="$config_message\n $dashes$dashes$dashes"
-  config_message="$config_message\n\n\n"
-
-  echo -e "$config_message"
-}

config/sources

@@ -1,2 +1,2 @@
 # Sourceforge download site
-  SOURCEFORGE_SRC="https://prdownloads.sourceforge.net"
+  SOURCEFORGE_SRC="http://prdownloads.sourceforge.net"

config/version

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

create_tar.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-git archive --format=tar --prefix=LibreELEC-source-$1/ tags/$1 | bzip2 > LibreELEC-source-$1.tar.bz2
+git archive --format=tar --prefix=OpenELEC-source-$1/ tags/$1 | bzip2 > OpenELEC-source-$1.tar.bz2

distributions/LibreELEC/options

@@ -1,229 +0,0 @@
-# LTO (Link Time Optimization) support
-  LTO_SUPPORT="yes"
-
-# GOLD (Google Linker) support
-  GOLD_SUPPORT="yes"
-
-# HARDENING (security relevant linker and compiler flags) support
-  HARDENING_SUPPORT="no"
-
-# Name of the Distro to build (full name, without special characters)
-  DISTRONAME="LibreELEC"
-
-# short project description
-  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="#                 LibreELEC                  #"
-  GREETING2="#            https://libreelec.tv            #"
-  GREETING3="##############################################"
-  GREETING4=""
-
-# Root password to integrate in the target system
-  ROOT_PASSWORD="libreelec"
-
-# Install glibc locales to the build (yes / no)
-  GLIBC_LOCALES="yes"
-
-# Mediacenter to use (kodi / no)
-  MEDIACENTER="kodi"
-
-# Skins to install (Estuary)
-# Space separated list is supported,
-# e.g. SKINS="Estuary"
-  SKINS="Estuary"
-
-# Default Skin (Estuary)
-  SKIN_DEFAULT="Estuary"
-
-# Select whether to use default (upstream xbmc/xbmc) repo, or specific vendor repo
-  KODI_VENDOR="default"
-
-# install extra subtitle Fonts for KODI (yes / no)
-  KODI_EXTRA_FONTS="yes"
-
-# build and install PulseAudio support (yes / no)
-  PULSEAUDIO_SUPPORT="yes"
-
-# build and install espeak support (yes / no)
-  ESPEAK_SUPPORT="yes"
-
-# build and install with BluRay support (yes / no)
-  KODI_BLURAY_SUPPORT="yes"
-
-# build and install with BD+ support
-# (BD+ decryption support in KODI) (yes / no)
-  BLURAY_BDPLUS_SUPPORT="yes"
-
-# build and install with AACS support
-# (BD decryption support in KODI) (yes / no)
-  BLURAY_AACS_SUPPORT="yes"
-
-# build and install with DVDCSS support
-# (DVD decryption support in KODI) (yes / no)
-  KODI_DVDCSS_SUPPORT="yes"
-
-# additional drivers to install:
-# for a list of additional drivers see packages/linux-drivers
-# Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8192EU RTL8188EU RTL8812AU"
-
-# build and install bluetooth support (yes / no)
-  BLUETOOTH_SUPPORT="yes"
-
-# build and install with KODI webfrontend (yes / no)
-  KODI_WEBSERVER_SUPPORT="yes"
-
-# build and install Avahi (Zeroconf) daemon (yes / no)
-  AVAHI_DAEMON="yes"
-
-# build with UPnP support (yes / no)
-  KODI_UPNP_SUPPORT="yes"
-
-# build with MySQL support (mysql / mariadb / none)
-  KODI_MYSQL_SUPPORT="mariadb"
-
-# build xbmc with optical drive support (yes / no)
-  KODI_OPTICAL_SUPPORT="yes"
-
-# build with AirPlay support (stream videos from iDevices to KODI) (yes / no)
-  KODI_AIRPLAY_SUPPORT="yes"
-
-# build with AirTunes support (stream music from iDevices to KODI) (yes / no)
-  KODI_AIRTUNES_SUPPORT="yes"
-
-# build with libnfs support (mounting nfs shares with KODI) (yes / no)
-  KODI_NFS_SUPPORT="yes"
-
-# build with Samba Client support (mounting SAMBA shares with KODI) (yes / no)
-  KODI_SAMBA_SUPPORT="yes"
-
-# build with NFS support (mounting nfs shares via the OS) (yes / no)
-  NFS_SUPPORT="yes"
-
-# build with Samba Client support (mounting samba shares via the OS) (yes / no)
-  SAMBA_SUPPORT="yes"
-
-# build and install Samba Server (yes / no)
-  SAMBA_SERVER="yes"
-
-# build and install SFTP Server (yes / no)
-  SFTP_SERVER="yes"
-
-# build and install OpenVPN support (yes / no)
-  OPENVPN_SUPPORT="yes"
-
-# build and install WireGuard support (yes / no)
-  WIREGUARD_SUPPORT="yes"
-
-# build and install diskmounter support (udevil)
-# this service provide auto mounting support for external drives in the
-# mediacenter also automount internally drives at boottime via udev (yes / no)
-  UDEVIL="yes"
-
-# build and install exFAT fuse support (yes / no)
-  EXFAT="yes"
-
-# build and install NTFS-3G fuse support (yes / no)
-  NTFS3G="yes"
-
-# build and install hfs filesystem utilities (yes / no)
-  HFSTOOLS="yes"
-
-# Windowmanager to use (fluxbox / none)
-  WINDOWMANAGER="fluxbox"
-
-# 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"
-  GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia nvidia-legacy vmware virtio"
-
-# build and install remote support (yes / no)
-  REMOTE_SUPPORT="yes"
-
-# build and install Joystick support (yes / no)
-  JOYSTICK_SUPPORT="yes"
-
-# build and install CEC adapter support (yes / no)
-  CEC_SUPPORT="yes"
-
-# build and install CEC framework support (yes / no)
-  CEC_FRAMEWORK_SUPPORT="no"
-
-# build and install iSCSI support - iscsistart (yes / no)
-  ISCSI_SUPPORT="yes"
-
-# Support for partitioning and formating disks in initramfs (yes / no)
-# This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
-  INITRAMFS_PARTED_SUPPORT="no"
-
-# build with swap support (yes / no)
-  SWAP_SUPPORT="yes"
-
-# swap support enabled per default (yes / no)
-  SWAP_ENABLED_DEFAULT="no"
-
-# swapfile size if SWAP_SUPPORT=yes in MB
-  SWAPFILESIZE="128"
-
-# additional packages to install:
-# Space separated list is supported,
-# e.g. ADDITIONAL_PACKAGES="PACKAGE1 PACKAGE2"
-  ADDITIONAL_PACKAGES=""
-
-# build with installer (yes / no)
-  INSTALLER_SUPPORT="yes"
-
-# Testpackages for development (yes / no)
-  TESTING="no"
-
-# OEM packages for OEM's (yes / no)
-  OEM_SUPPORT="no"
-
-# build and install nano text editor (yes / no)
-  NANO_EDITOR="yes"
-
-# cron support (yes / no)
-  CRON_SUPPORT="yes"
-
-# Distribution Specific source location
-  DISTRO_MIRROR="http://sources.libreelec.tv/mirror"
-  DISTRO_SRC="http://sources.libreelec.tv/$LIBREELEC_VERSION"
-
-# Addon Server Url
-  ADDON_SERVER_URL="https://addons.libreelec.tv"
-
-# set the addon dirs
-  ADDON_PATH="$ADDON_VERSION/${DEVICE:-$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=8192
-
-# Configure debug groups (space delimited key=value pairs, with each value comma-delimited) and default group when DEBUG=yes
-# Use ! or - prefix to prevent a dependent package from being built with debug. Add + suffix to build dependenencies with debug.
-  DEBUG_GROUPS="kodi+=kodi+,kodi-platform+,p8-platform+,!mesa"
-  DEBUG_GROUP_YES="kodi+"
-
-# Default supported get handlers (archive, git, file etc.)
-  GET_HANDLER_SUPPORT="archive"
-
-# Partition labels for USB/SD installation media
-  DISTRO_BOOTLABEL="LIBREELEC"
-  DISTRO_DISKLABEL="STORAGE"
-
-# Settings package name - blank if not required
-  DISTRO_PKG_SETTINGS="LibreELEC-settings"
-
-# IR remote protocols supported in default config
-  IR_REMOTE_PROTOCOLS="RC6 NEC"
-
-# IR remote keymaps supported in default config
-  IR_REMOTE_KEYMAPS="rc6_mce xbox_360 xbox_one"
-
-# debug tty path
-  DEBUG_TTY="/dev/tty3"

distributions/LibreELEC/version

@@ -1,8 +0,0 @@
-# VERSION: set full version, use "devel" for development version
-  LIBREELEC_VERSION="devel"
-
-# OS_VERSION: OS Version
-  OS_VERSION="9.2"
-
-# ADDON_VERSION: Addon version
-  ADDON_VERSION="9.2.0"

licenses/BSL.txt

@@ -1,23 +0,0 @@
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.

licenses/LibPNG2.txt

@@ -1,134 +0,0 @@
-COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
-=========================================
-
-PNG Reference Library License version 2
----------------------------------------
-
- * Copyright (c) 1995-2019 The PNG Reference Library Authors.
- * Copyright (c) 2018-2019 Cosmin Truta.
- * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
- * Copyright (c) 1996-1997 Andreas Dilger.
- * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-
-The software is supplied "as is", without warranty of any kind,
-express or implied, including, without limitation, the warranties
-of merchantability, fitness for a particular purpose, title, and
-non-infringement.  In no event shall the Copyright owners, or
-anyone distributing the software, be liable for any damages or
-other liability, whether in contract, tort or otherwise, arising
-from, out of, or in connection with the software, or the use or
-other dealings in the software, even if advised of the possibility
-of such damage.
-
-Permission is hereby granted to use, copy, modify, and distribute
-this software, or portions hereof, for any purpose, without fee,
-subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you
-    must not claim that you wrote the original software.  If you
-    use this software in a product, an acknowledgment in the product
-    documentation would be appreciated, but is not required.
-
- 2. Altered source versions must be plainly marked as such, and must
-    not be misrepresented as being the original software.
-
- 3. This Copyright notice may not be removed or altered from any
-    source or altered source distribution.
-
-
-PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
------------------------------------------------------------------------
-
-libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are
-Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
-derived from libpng-1.0.6, and are distributed according to the same
-disclaimer and license as libpng-1.0.6 with the following individuals
-added to the list of Contributing Authors:
-
-    Simon-Pierre Cadieux
-    Eric S. Raymond
-    Mans Rullgard
-    Cosmin Truta
-    Gilles Vollant
-    James Yu
-    Mandar Sahastrabuddhe
-    Google Inc.
-    Vadim Barkov
-
-and with the following additions to the disclaimer:
-
-    There is no warranty against interference with your enjoyment of
-    the library or against infringement.  There is no warranty that our
-    efforts or the library will fulfill any of your particular purposes
-    or needs.  This library is provided with all faults, and the entire
-    risk of satisfactory quality, performance, accuracy, and effort is
-    with the user.
-
-Some files in the "contrib" directory and some configure-generated
-files that are distributed with libpng have other copyright owners, and
-are released under other open source licenses.
-
-libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
-Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
-libpng-0.96, and are distributed according to the same disclaimer and
-license as libpng-0.96, with the following individuals added to the
-list of Contributing Authors:
-
-    Tom Lane
-    Glenn Randers-Pehrson
-    Willem van Schaik
-
-libpng versions 0.89, June 1996, through 0.96, May 1997, are
-Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
-and are distributed according to the same disclaimer and license as
-libpng-0.88, with the following individuals added to the list of
-Contributing Authors:
-
-    John Bowler
-    Kevin Bracey
-    Sam Bushell
-    Magnus Holmgren
-    Greg Roelofs
-    Tom Tanner
-
-Some files in the "scripts" directory have other copyright owners,
-but are released under this license.
-
-libpng versions 0.5, May 1995, through 0.88, January 1996, are
-Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-
-For the purposes of this copyright and license, "Contributing Authors"
-is defined as the following set of individuals:
-
-    Andreas Dilger
-    Dave Martindale
-    Guy Eric Schalnat
-    Paul Schmidt
-    Tim Wegner
-
-The PNG Reference Library is supplied "AS IS".  The Contributing
-Authors and Group 42, Inc. disclaim all warranties, expressed or
-implied, including, without limitation, the warranties of
-merchantability and of fitness for any purpose.  The Contributing
-Authors and Group 42, Inc. assume no liability for direct, indirect,
-incidental, special, exemplary, or consequential damages, which may
-result from the use of the PNG Reference Library, even if advised of
-the possibility of such damage.
-
-Permission is hereby granted to use, copy, modify, and distribute this
-source code, or portions hereof, for any purpose, without fee, subject
-to the following restrictions:
-
- 1. The origin of this source code must not be misrepresented.
-
- 2. Altered versions must be plainly marked as such and must not
-    be misrepresented as being the original source.
-
- 3. This Copyright notice may not be removed or altered from any
-    source or altered source distribution.
-
-The Contributing Authors and Group 42, Inc. specifically permit,
-without fee, and encourage the use of this source code as a component
-to supporting the PNG file format in commercial products.  If you use
-this source code in a product, acknowledgment is not required but would
-be appreciated.

packages/3rdparty/graphics/libpng12/build

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+ac_cv_lib_z_zlibVersion=yes \
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-static \
+            --enable-shared
+
+make

packages/3rdparty/graphics/libpng12/meta

@@ -0,0 +1,35 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="libpng"
+PKG_VERSION="1.2.50"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.libpng.org/"
+PKG_URL="$SOURCEFORGE_SRC/libpng/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="zlib"
+PKG_BUILD_DEPENDS="toolchain zlib"
+PKG_PRIORITY="optional"
+PKG_SECTION="graphics"
+PKG_SHORTDESC="libpng: Portable Network Graphics (PNG) Reference Library - old 1.2 version"
+PKG_LONGDESC="PNG (Portable Network Graphics) is an extensible file format for the lossless, portable, well-compressed storage of raster images. PNG provides a patent-free replacement for GIF and can also replace many common uses of TIFF. Indexed-color, grayscale, and truecolor images are supported, plus an optional alpha channel. Sample depths range from 1 to 16 bits. Old 1.2 version."
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"

packages/3rdparty/graphics/libpng12/unpack

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+TGZ_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
+
+  tar xJf $SOURCES/$1/$TGZ_PKG -C $BUILD >/dev/null 2>&1

packages/3rdparty/lib/cxxtools/build

@@ -0,0 +1,60 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+
+setup_toolchain host
+
+mkdir -p .build-host && cd .build-host
+
+../configure --host=$HOST_NAME \
+            --build=$HOST_NAME \
+            --prefix=$ROOT/$TOOLCHAIN \
+            --disable-static \
+            --enable-shared \
+            --disable-demos \
+            --disable-unittest
+
+make
+make install
+
+cd ..
+
+setup_toolchain target
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+mkdir -p .build-target && cd .build-target
+../configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --enable-static \
+            --disable-shared \
+            --disable-demos \
+            --disable-unittest
+
+$MAKEINSTALL

packages/3rdparty/lib/cxxtools/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="cxxtools"
+PKG_VERSION="2.1.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL-2"
+PKG_SITE="http://www.tntnet.org/cxxtools.html"
+PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="python/web"
+PKG_SHORTDESC="cxxtools: a collection of general-purpose C++ classes"
+PKG_LONGDESC="Cxxtools is a collection of general-purpose C++ classes"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

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

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

packages/3rdparty/lib/libhdhomerun/build

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+
+make CROSS_COMPILE=$TARGET_PREFIX

packages/3rdparty/lib/libhdhomerun/meta

@@ -0,0 +1,35 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="libhdhomerun"
+PKG_VERSION="20130328"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="LGPL"
+PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
+PKG_URL="http://download.silicondust.com/hdhomerun/${PKG_NAME}_${PKG_VERSION}.tgz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="driver"
+PKG_SHORTDESC="The library provides functionality to setup the HDHomeRun, change channels, setup PID filtering, get signal quality and so on."
+PKG_LONGDESC="The library provides functionality to setup the HDHomeRun, change channels, setup PID filtering, get signal quality and so on."
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"

packages/3rdparty/lib/libhdhomerun/rename

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $BUILD
+mv ${PKG_NAME} ${PKG_NAME}_${PKG_VERSION}

packages/3rdparty/lib/libxslt/build

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+
+./configure --host=$TARGET_NAME \
+             --build=$HOST_NAME \
+             --prefix=/usr \
+             --sysconfdir=/etc \
+             --enable-static \
+             --disable-shared \
+             --disable-ipv6 \
+             --without-python \
+             --without-crypto
+
+make
+
+$MAKEINSTALL
+
+$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \
+  $SYSROOT_PREFIX/usr/bin/xslt-config
+
+mv $SYSROOT_PREFIX/usr/bin/xslt-config $ROOT/$TOOLCHAIN/bin

packages/3rdparty/lib/libxslt/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="libxslt"
+PKG_VERSION="1.1.27"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="MIT"
+PKG_SITE="http://xmlsoft.org/xslt/"
+PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="textproc"
+PKG_SHORTDESC="libxslt"
+PKG_LONGDESC="libxslt"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

packages/3rdparty/lib/libzip/build

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+
+./configure \
+       --host=$TARGET_NAME \
+       --build=$HOST_NAME \
+       --enable-static \
+       --disable-shared \
+       --prefix=/usr 
+
+$MAKEINSTALL

packages/3rdparty/lib/libzip/meta

@@ -0,0 +1,34 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="libzip"
+PKG_VERSION="0.10.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.nih.at/libzip/"
+PKG_URL="http://www.nih.at/libzip/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SHORTDESC="libzip"
+PKG_LONGDESC="libzip"
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/rotorng/build

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+VDR_DIR=`basename $BUILD/vdr-[0-9]*`
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+cd $PKG_BUILD
+
+make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

packages/3rdparty/multimedia/rotorng/meta

@@ -0,0 +1,37 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="rotorng"
+PKG_VERSION="0.3.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://projects.vdr-developer.org/projects/plg-rotor-ng"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_URL="http://projects.vdr-developer.org/attachments/download/1088/rotorng-${PKG_VERSION}.tar.gz"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="Next generation of a VDR plugin design to drive a diseqc rotor"
+PKG_LONGDESC="Next generation of a VDR plugin design to drive a diseqc rotor"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

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

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

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

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+VDR_DIR=`basename $BUILD/vdr-[0-9]*`
+
+cd $PKG_BUILD
+  PWD=`pwd`
+  make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

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

@@ -0,0 +1,37 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="vdr-control"
+PKG_VERSION="0.0.2a"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://ricomp.de/vdr/"
+PKG_URL="http://ricomp.de/vdr/${PKG_NAME}-${PKG_VERSION}.tgz"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr control plugin"
+PKG_LONGDESC="vdr control plugin"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-01_Makefile-fPIC-fix.patch

@@ -0,0 +1,20 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## Makefile-fPIC-fix patch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds -fPIC to Makefile to fix potential FTBFS.
+
+@DPATCH@
+diff -urNad /usr/src/cvs/vdrdevel-plugin-rotor/Makefile vdrdevel-plugin-rotor/Makefile
+--- /usr/src/cvs/vdrdevel-plugin-rotor/Makefile	Sun May 16 15:48:12 2004
++++ vdrdevel-plugin-rotor/Makefile	Sat Sep 11 00:28:18 2004
+@@ -18,7 +18,7 @@
+ ### The C++ compiler and options:
+ 
+ CXX      ?= g++
+-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
+ 
+ ### The directory environment:
+ 

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-02_gateway.patch

@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_gateway.dpatch by Walter, dg9ep @ vdrportal.de
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes problems when ending a telnet session with ctrl-c
+## DP: see: http://www.vdr-portal.de/board/thread.php?threadid=49680
+
+@DPATCH@
+diff -urNad vdr-plugin-control-0.0.2a~/gateway.c vdr-plugin-control-0.0.2a/gateway.c
+--- vdr-plugin-control-0.0.2a~/gateway.c	2004-07-02 21:24:22.000000000 +0200
++++ vdr-plugin-control-0.0.2a/gateway.c	2007-04-12 22:51:16.000000000 +0200
+@@ -36,7 +36,7 @@
+   _pTelnet	(0),
+   _pFormatter   (0)
+ {
+-  gl_CtrlGatewayCol.Add(this);
++//  gl_CtrlGatewayCol.Add(this);
+ 
+ //  if (! cKbdRemoteForControl::_pRemote)
+ //    cKbdRemoteForControl::_pRemote = new cKbdRemoteForControl();
+@@ -163,8 +163,8 @@
+ 
+ //  UnprepareSocket();
+ 
+-  if (! _terminating)
+-    gl_CtrlGatewayCol.Del(this);
++//  if (! _terminating)
++//    gl_CtrlGatewayCol.Del(this);
+ 
+   conDSYSLOG("gateway thread ended (pid=%d)", getpid());
+ conLOG_GATEW("gateway thread ended (pid=%d)", getpid());

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-92_control-1.3.18.patch

@@ -0,0 +1,35 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## control-1.3.18 patch - by Thomas G<>nther <tom@toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.3.18.
+
+@DPATCH@
+--- control-0.0.2a/gateway.c
++++ control-0.0.2a/gateway.c
+@@ -102,7 +102,12 @@
+ 
+       uint64 Command = 0;
+       uint i = 0;
++#if VDRVERSNUM >= 10318
++      cTimeMs timeout;
++      timeout.Set(100);
++#else
+       int t0 = time_ms();
++#endif
+       while (_active && i < sizeof(Command)) {
+ 
+         uchar ch;
+@@ -131,7 +136,11 @@
+           // of their codes, so we'll need to wait some 100ms to see if
+           // there is more coming up - or whether this really is the 'ESC'
+           // key (if somebody knows how to clean this up, please let me know):
++#if VDRVERSNUM >= 10318
++          if (Command == 0x1B && !timeout.TimedOut())
++#else
+           if (Command == 0x1B && time_ms() - t0 < 100)
++#endif
+             continue;
+ 
+           if (Command) {

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-93_control-0.0.2a-1.5.0.patch

@@ -0,0 +1,73 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 93_control-0.0.2a-1.5.0.dpatch by Thomas G<>nther <tom@toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.0 (applicable to VDR >= 1.4.5).
+
+@DPATCH@
+--- control-0.0.2a/gateway.c
++++ control-0.0.2a/gateway.c
+@@ -100,7 +100,7 @@
+ 
+     if (_stack.poll(100)) {
+ 
+-      uint64 Command = 0;
++      uint64_t Command = 0;
+       uint i = 0;
+       int t0 = time_ms();
+       while (_active && i < sizeof(Command)) {
+--- control-0.0.2a/keyboard.c
++++ control-0.0.2a/keyboard.c
+@@ -18,7 +18,7 @@
+ 
+ struct tKbdMap {
+   eKbdFunc func;
+-  uint64 code;
++  uint64_t code;
+ };
+ 
+ 
+@@ -117,7 +117,7 @@
+ 
+ 
+ 
+-bool cCtrlKeyboard::intPut(uint64 Command, bool Repeat, bool Release) {
++bool cCtrlKeyboard::intPut(uint64_t Command, bool Repeat, bool Release) {
+ 
+   bool ret = cRemote::Put(Command, Repeat, Release);
+ conLOG_KEYB("%s cKbdRemoteForControl::intPut(0x%016LX)", ret ? "true" : "false", Command);
+@@ -126,7 +126,7 @@
+ 
+ 
+ 
+-bool cCtrlKeyboard::Put(uint64 Command, bool Repeat, bool Release) {
++bool cCtrlKeyboard::Put(uint64_t Command, bool Repeat, bool Release) {
+ 
+   if (! _pRemote)
+     _pRemote = new cCtrlKeyboard();
+@@ -136,7 +136,7 @@
+ 
+ 
+ 
+-int cCtrlKeyboard::MapCodeToFunc(uint64 Code) {
++int cCtrlKeyboard::MapCodeToFunc(uint64_t Code) {
+ 
+   for (const tKbdMap *p = keyboardKbdMap; p->func != kfNone; p++) {
+     if (p->code == Code)
+--- control-0.0.2a/keyboard.h
++++ control-0.0.2a/keyboard.h
+@@ -30,11 +30,11 @@
+   cCtrlKeyboard();
+   virtual ~cCtrlKeyboard();
+ 
+-  bool intPut(uint64 Command, bool Repeat, bool Release);
++  bool intPut(uint64_t Command, bool Repeat, bool Release);
+ 
+ public:
+-  static bool Put(uint64 Command, bool Repeat = false, bool Release = false);
+-  static int MapCodeToFunc(uint64 Code);
++  static bool Put(uint64_t Command, bool Repeat = false, bool Release = false);
++  static int MapCodeToFunc(uint64_t Code);
+ };
+ 
+ 

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-94_gcc-4.4.patch

@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 94_gcc-4.4.dpatch by Tobias Grimm <etobi@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad vdr-plugin-control-0.0.2a~/formatter.c vdr-plugin-control-0.0.2a/formatter.c
+--- vdr-plugin-control-0.0.2a~/formatter.c	2004-07-02 21:24:22.000000000 +0200
++++ vdr-plugin-control-0.0.2a/formatter.c	2009-11-11 22:07:56.000000000 +0100
+@@ -165,7 +165,7 @@
+ 
+   if (Title) {
+ 
+-    char* t = strchr(Title, '\t');
++    const char* t = strchr(Title, '\t');
+     if (t) {
+ 
+       int size = t - Title;
+@@ -300,7 +300,7 @@
+ 
+   for (;;) {
+ 
+-    char* t = strchr(text, '\t');
++    const char* t = strchr(text, '\t');
+     if (t) {
+       // Tab found - check if the tab can be used
+ 

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-95_vdr-crash-fix.patch

@@ -0,0 +1,28 @@
+diff -Nru control-0.0.2a-kw3/control.c control-0.0.2a-kw3_0/control.c
+--- control-0.0.2a-kw3/control.c	2008-09-26 16:19:29.000000000 +0200
++++ control-0.0.2a-kw3_0/control.c	2012-08-04 12:17:08.000000000 +0200
+@@ -32,6 +32,7 @@
+ class cPluginControl : public cPlugin {
+ private:
+   // Add any member variables or functions you may need here.
++  cCtrlState* _pState;
+   cCtrlGateways* _pReceivers;
+   cCtrlGateway*  _pTerminal;
+ 
+@@ -67,6 +68,7 @@
+ cPluginControl::~cPluginControl()
+ {
+   // Clean up after yourself!
++  delete(_pState);
+   delete(_pReceivers);
+   delete(_pTerminal);
+ }
+@@ -120,7 +122,7 @@
+   // Start any background activities the plugin shall perform.
+ 
+   if (glParPort || glParTerminal && *glParTerminal)
+-    new cCtrlState();
++    _pState = new cCtrlState();
+ 
+   if (glParPort) {
+     _pReceivers = new cCtrlGateways();

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-96_makefile_apiversion.patch

@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index 65a7674..1a5976e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,7 @@ TMPDIR = /tmp
+ 
+ ### The version number of VDR (taken from VDR's "config.h"):
+ 
+-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
++APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+ 
+ ### The name of the distribution archive:
+ 
+@@ -54,7 +54,7 @@ all: libvdr-$(PLUGIN).so
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
++	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ dist: clean
+ 	@-rm -rf $(TMPDIR)/$(ARCHIVE)

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

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $BUILD
+mv control-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION}

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

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+VDR_DIR=`basename $BUILD/vdr-[0-9]*`
+
+CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+
+cd $PKG_BUILD
+  PWD=`pwd`
+  make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

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

@@ -0,0 +1,37 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="vdr-epgsearch"
+PKG_VERSION="e2de927"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://winni.vdr-developer.org/epgsearch/"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr-epgsearch"
+PKG_LONGDESC="vdr-epgsearch"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

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

@@ -0,0 +1,68 @@
+diff --git a/Makefile b/Makefile
+index 6bb1b96..118e379 100644
+--- a/Makefile
++++ b/Makefile
+@@ -62,21 +62,10 @@ VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ p
+ 
+ ### The directory environment:
+ 
+-# Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG   = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR   = $(call PKGCFG,libdir)
+-LOCDIR   = $(call PKGCFG,locdir)
+-MANDIR   = $(call PKGCFG,mandir)
+-CONFDIR  = $(call PKGCFG,configdir)
+-BINDIR   = $(call PKGCFG,bindir)
+-#
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
+-
+ ### configuring modules
+ ifeq ($(AUTOCONFIG),1)
+ 	ifeq (exists, $(shell pkg-config libpcre && echo exists))
+@@ -92,9 +81,11 @@ ifeq ($(AUTOCONFIG),1)
+ 	endif
+ endif
+ 
++include $(VDRDIR)/Make.global
++
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### The name of the distribution archive:
+ 
+@@ -103,7 +94,7 @@ PACKAGE = vdr-$(ARCHIVE)
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES +=
++INCLUDES += -I$(VDRDIR)/include
+ 
+ DEFINES += 
+ 
+@@ -231,15 +222,19 @@ install-i18n: $(I18Nmsgs)
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ libvdr-$(PLUGIN2).so: $(OBJS2)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS2) $(LIBS2) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ libvdr-$(PLUGIN3).so: $(OBJS3)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS3) $(LIBS3) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ libvdr-$(PLUGIN4).so: $(OBJS4)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS4) $(LIBS4) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ createcats: createcats.o Makefile
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) createcats.o -o $@

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

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+VDR_DIR=`basename $BUILD/vdr-[0-9]*`
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+cd $PKG_BUILD
+make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

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

@@ -0,0 +1,37 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="vdr-iptv"
+PKG_VERSION="2.0.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/"
+PKG_URL="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr curl"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr-iptv: an IPTV plugin for the Video Disk Recorder (VDR)"
+PKG_LONGDESC="vdr-iptv is an IPTV plugin for the Video Disk Recorder (VDR)"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

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

@@ -0,0 +1,56 @@
+diff --git a/Makefile b/Makefile
+index 7f147b8..db294fc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,8 +12,6 @@
+ 
+ # Strip debug symbols?  Set eg. to /bin/true if not
+ 
+-STRIP = strip
+-
+ # The official name of this plugin.
+ # This name will be used in the '-P...' option of VDR to load the plugin.
+ # By default the main source file also carries this name.
+@@ -27,23 +25,15 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
+ 
+ ### The directory environment:
+ 
+-# Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR = $(call PKGCFG,libdir)
+-LOCDIR = $(call PKGCFG,locdir)
+-PLGCFG = $(call PKGCFG,plgcfg)
+-CFGDIR = $(call PKGCFG,configdir)
+-#
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++include $(VDRDIR)/Make.global
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+@@ -64,7 +54,7 @@ LIBS = $(shell curl-config --libs)
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES +=
++INCLUDES += -I$(VDRDIR)/include
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+@@ -138,6 +128,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ ifndef IPTV_DEBUG
+ 	@$(STRIP) $@
+ endif

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

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $BUILD
+mv iptv-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION}

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

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+VDR_DIR=`basename $BUILD/vdr-[0-9]*`
+
+CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+
+# dont build parallel
+  MAKEFLAGS=-j1
+
+cd $PKG_BUILD
+  PWD=`pwd`
+  make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"