config/version: set version to 3.1.3

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

.gitignore

@@ -23,11 +23,6 @@ mkpkg-temp
 /sources
 /.work
 
-# ccache
-/.ccache/
-
 # backup files
 *.orig
 
-# crap
-.DS_Store

.gitmodules

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

CHANGELOG

@@ -1,13 +1,20 @@
-LibreELEC CHANGELOG
-==================
+OpenELEC (Version 2.1)
 
-To view recent changes/commits to the project (master branch) please visit:
+Changelog OpenELEC-2.0 to OpenELEC-2.1
 
-https://github.com/LibreELEC/LibreELEC.tv/commits/master
+Added packages:
+  - add package 'ppp'
+  - add package 'pptp'
 
-To compare commits between versions use a formatted URL like:
+Package updates:
+  - update linux to linux-3.5
+  - update dialog to dialog-1.1-20120215
+  - update connman to connman-1.4
 
-https://github.com/LibreELEC/LibreELEC.tv/compare/3.2.3...3.2.4
+Added functions:
+  - sshd can be enabled via OpenELEC Settings addon
+  - add PPTP support
 
-If you have questions on differences between releases please ask them in the
-LibreELEC website forums or IRC support channel.
+Changed functions:
+
+Removed functions:

CONTRIBUTING.md

@@ -1,54 +1,36 @@
-### Questions about LibreELEC?
+## Questions about OpenELEC?
 
-To get your questions answered, please ask in the LibreELEC [Forum], on IRC: 
-\#libreelec on freenode.net, or [webchat]. 
+To get your questions answered, please ask in the OpenELEC [Forum] or 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 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 bee opend later.
 
-If you are at all unsure whether it's a bug in LibreELEC or a problem with 
-something else, post in the LibreELEC [Forum] instead. If it turns out that it is
-a bug, an issue can always be opened later.
-
-If you are sure that it's a bug in 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.
+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 +48,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,8 +86,8 @@ Please follow this process; it's the best way to get your work included in the p
 - [Open a Pull Request](https://help.github.com/articles/using-pull-requests) with a
     clear title and description.
 
-[Forum]: http://libreelec.tv/forum
-[issue]: https://github.com/LibreELEC/LibreELEC.tv/issues
-[webchat]: http://libreelec.tv/support/chat
-[logfiles]: http://wiki.libreelec.tv/index.php?title=LibreELEC_FAQ#Support_Logs
-[similar issue]: https://github.com/LibreELEC/LibreELEC.tv/search?&ref=cmdform&type=Issues
+[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,20 +8,8 @@ system:
 release:
 	./scripts/image release
 
-image:
-	./scripts/image mkimage
-
-noobs:
-	./scripts/image noobs
-
-amlpkg:
-	./scripts/image amlpkg
-
 clean:
 	rm -rf $(BUILD_DIRS)/* $(BUILD_DIRS)/.stamps
 
-distclean:
-	rm -rf ./.ccache ./$(BUILD_DIRS)
-
 src-pkg:
 	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](http://kodi.tv) software on popular mediacentre hardware. LibreELEC is a conservative fork of the popular [OpenELEC](http://openelec.tv) project with a stronger focus on pre-release testing and post-release change management. Further information on the project can be found on the [LibreELEC website](https://libreelec.tv).
+# OpenELEC - 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](http://forum.libreelec.tv/forum-35.html). Please ask support questions in the [LibreELEC forum: Help & Support](http://forum.libreelec.tv/forum-3.html) or ask a member of project staff in the #libreelec IRC channel on Freenode.
+**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](http://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. For a complete copyright list please checkout the source code to examine license headers. Unless expressly stated otherwise all code submitted to the LibreELEC project (in any form) is licensed under [GPLv2](http://www.gnu.org/licenses/gpl-2.0.html) and copyright is donated to LibreELEC.tv. This approach allows the project to stay manageable in the long term by giving us freedom to maintain the code as part of the whole without the management overhead of preserving contact with every submitter, e.g. GPLv3. You are absolutely free to retain copyright. To retain copyright simply add a copyright header to each submitted code page. If you submit code that is not your own work it is your responsibility to place a header stating the copyright.
+* 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.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.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}"
-      SIMD_SUPPORT="yes"
-      ;;
-  esac
-
-  TARGET_GCC_ARCH=${TARGET_SUBARCH/-}
-  TARGET_KERNEL_ARCH=arm64
-
-# setup ARCH specific *FLAGS
-  TARGET_CFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mabi=lp64 -Wno-psabi $TARGET_EXTRA_FLAGS"
-  TARGET_LDFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mtune=$TARGET_CPU"
-  GCC_OPTS="--with-abi=lp64 --with-arch=$TARGET_VARIANT"

config/arch.arm

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

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

config/docker/changelog.txt

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

config/docker/package.mk

@@ -1,45 +0,0 @@
-################################################################################
-#      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
-#
-#  LibreELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  LibreELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-PKG_NAME="@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,25 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
-#
-#  LibreELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  LibreELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-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,35 +0,0 @@
-################################################################################
-#      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
-#
-#  LibreELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  LibreELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-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/functions

@@ -1,147 +1,65 @@
 setup_toolchain() {
-  case "$1" in
-    target|init)
-      export DESTIMAGE="target"
-      export CC="${TARGET_PREFIX}gcc"
-      export CXX="${TARGET_PREFIX}g++"
-      export CPP="${TARGET_PREFIX}cpp"
-      export LD="${TARGET_PREFIX}ld"
-      export AS="${TARGET_PREFIX}as"
-      export AR="${TARGET_PREFIX}ar"
-      export NM="${TARGET_PREFIX}nm"
-      export RANLIB="${TARGET_PREFIX}ranlib"
-      export OBJCOPY="${TARGET_PREFIX}objcopy"
-      export OBJDUMP="${TARGET_PREFIX}objdump"
-      export STRIP="${TARGET_PREFIX}strip"
-      export CPPFLAGS="$TARGET_CPPFLAGS"
-      export CFLAGS="$TARGET_CFLAGS"
-      export CXXFLAGS="$TARGET_CXXFLAGS"
-      export LDFLAGS="$TARGET_LDFLAGS"
-      export PKG_CONFIG="$ROOT/$TOOLCHAIN/bin/pkg-config"
-      export PKG_CONFIG_PATH=""
-      export PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
-      export PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
-      export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-      export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-      export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf
-      export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr"
-      if [ ! -f $CMAKE_CONF ] ; then
-        mkdir -p $ROOT/$TOOLCHAIN/etc
-        echo "SET(CMAKE_SYSTEM_NAME Linux)" >> $CMAKE_CONF
-        echo "SET(CMAKE_SYSTEM_VERSION 1)"  >> $CMAKE_CONF
-        echo "SET(CMAKE_SYSTEM_PROCESSOR  $TARGET_ARCH)" >> $CMAKE_CONF
-        echo "SET(CMAKE_C_COMPILER   $CC)"  >> $CMAKE_CONF
-        echo "SET(CMAKE_CXX_COMPILER $CXX)" >> $CMAKE_CONF
-        echo "SET(CMAKE_CPP_COMPILER $CPP)" >> $CMAKE_CONF
-        echo "SET(CMAKE_FIND_ROOT_PATH  $SYSROOT_PREFIX)"   >> $CMAKE_CONF
-        echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> $CMAKE_CONF
-        echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)"  >> $CMAKE_CONF
-        echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)"  >> $CMAKE_CONF
-        echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)"  >> $CMAKE_CONF
-      fi
-      export HOST_CC="$ROOT/$TOOLCHAIN/bin/host-gcc"
-      export HOST_CXX="$ROOT/$TOOLCHAIN/bin/host-g++"
-      export HOSTCC="$HOST_CC"
-      export HOSTCXX="$HOST_CXX"
-      export CC_FOR_BUILD="$HOST_CC"
-      export CXX_FOR_BUILD="$HOST_CXX"
-      export BUILD_CC="$HOST_CC"
-      export BUILD_CXX="$HOST_CXX"
-      export _python_sysroot="$SYSROOT_PREFIX"
-      export _python_prefix=/usr
-      export _python_exec_prefix=/usr
-      ;;
-    host|bootstrap)
-      export DESTIMAGE="host"
-      export AWK="gawk"
-      export CC="$ROOT/$TOOLCHAIN/bin/host-gcc"
-      export CXX="$ROOT/$TOOLCHAIN/bin/host-g++"
-      export CPP="cpp"
-      export LD="ld"
-      export AS="as"
-      export AR="ar"
-      export NM="nm"
-      export RANLIB="ranlib"
-      export OBJCOPY="objcopy"
-      export OBJDUMP="objdump"
-      export STRIP="strip"
-      export CPPFLAGS="$HOST_CPPFLAGS"
-      export CFLAGS="$HOST_CFLAGS"
-      export CXXFLAGS="$HOST_CXXFLAGS"
-      export LDFLAGS="$HOST_LDFLAGS"
-      export PKG_CONFIG="$ROOT/$TOOLCHAIN/bin/pkg-config"
-      export PKG_CONFIG_PATH=""
-      export PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig"
-      export PKG_CONFIG_SYSROOT_DIR=""
-      unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
-      unset PKG_CONFIG_ALLOW_SYSTEM_LIBS
-      export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf
-      export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN"
-      if [ ! -f $CMAKE_CONF ] ; then
-        mkdir -p $TOOLCHAIN/etc
-        echo "SET(CMAKE_SYSTEM_NAME Linux)" >> $CMAKE_CONF
-        echo "SET(CMAKE_SYSTEM_VERSION 1)"  >> $CMAKE_CONF
-        echo "SET(CMAKE_C_COMPILER   $CC)"  >> $CMAKE_CONF
-        echo "SET(CMAKE_CXX_COMPILER $CXX)" >> $CMAKE_CONF
-        echo "SET(CMAKE_CPP_COMPILER $CXX)" >> $CMAKE_CONF
-        echo "SET(CMAKE_AR $AR CACHE FILEPATH "Archiver")" >> $CMAKE_CONF # hum?
-        echo "SET(CMAKE_FIND_ROOT_PATH  $ROOT/$TOOLCHAIN)" >> $CMAKE_CONF
-        echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)" >> $CMAKE_CONF
-        echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)" >> $CMAKE_CONF
-        echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)" >> $CMAKE_CONF
-        echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)" >> $CMAKE_CONF
-      fi
-      export HOST_CC="$CC"
-      export HOST_CXX="$CXX"
-      export HOSTCC="$CC"
-      export HOSTCXX="$CXX"
-      export CC_FOR_BUILD="$CC"
-      export CXX_FOR_BUILD="$CXX"
-      export BUILD_CC="$CC"
-      export BUILD_CXX="$CXX"
-      ;;
-  esac
+  if [ "$1" = "--optimize" ]; then
+    OPTIMIZE=yes
+    shift
+  fi
+
+  if [ "$1" = target ]; then
+    export DESTIMAGE="target"
+
+    export CC=$TARGET_CC
+    export CXX=$TARGET_CXX
+    export LD=$TARGET_LD
+    export AS=$TARGET_AS
+    export AR=$TARGET_AR
+    export NM=$TARGET_NM
+    export RANLIB=$TARGET_RANLIB
+    export OBJCOPY=$TARGET_OBJCOPY
+    export OBJDUMP=$TARGET_OBJDUMP
+    export STRIP=$TARGET_STRIP
+    export CPPFLAGS="$TARGET_CPPFLAGS"
+    export CFLAGS="$TARGET_CFLAGS"
+    export CXXFLAGS="$TARGET_CXXFLAGS"
+    export LDFLAGS="$TARGET_LDFLAGS"
+    export PKG_CONFIG_PATH="$TARGET_PKG_CONFIG_PATH"
+    export PKG_CONFIG_LIBDIR="$TARGET_PKG_CONFIG_LIBDIR"
+    export PKG_CONFIG_SYSROOT_DIR="$TARGET_PKG_CONFIG_SYSROOT_DIR"
+
+  # set CMAKE configfile for target
+    export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf
+
+  elif [ "$1" = host ]; then
+    export DESTIMAGE="host"
+
+    export AWK=$HOST_AWK
+    export CC=$HOST_CC
+    export CXX=$HOST_CXX
+    export LD=$HOST_LD
+    export AS=$HOST_AS
+    export AR=$HOST_AR
+    export NM=$HOST_NM
+    export RANLIB=$HOST_RANLIB
+    export OBJCOPY=$HOST_OBJCOPY
+    export STRIP=$HOST_STRIP
+    export CPPFLAGS="$HOST_CPPFLAGS"
+    export CFLAGS="$HOST_CFLAGS"
+    export CXXFLAGS="$HOST_CXXFLAGS"
+    export LDFLAGS="$HOST_LDFLAGS"
+    export PKG_CONFIG_PATH="$HOST_PKG_CONFIG_PATH"
+    export PKG_CONFIG_LIBDIR="$HOST_PKG_CONFIG_LIBDIR"
+    export PKG_CONFIG_SYSROOT_DIR="$HOST_PKG_CONFIG_SYSROOT_DIR"
+
+  # set CMAKE configfile for host
+    export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf
+
+  fi
 }
 
 kernel_path() {
-  get_build_dir linux
+  ls -d $ROOT/$BUILD/linux-*
 }
 
-kernel_version() {
-  get_pkg_version linux
-}
-
-# get kernel module dir
-get_module_dir() {
-  basename $(ls -d $(get_build_dir linux)/.install_pkg/usr/lib/modules/*)
-}
-
-# get package's build dir
-get_build_dir() {
-  local _PKG_NAME="$(get_pkg_variable "$1" PKG_NAME)" _PKG_VERSION="$(get_pkg_version "$1")"
-  if [ -n "$_PKG_NAME" -a -n "$_PKG_VERSION" ]; then
-    echo $ROOT/$BUILD/${_PKG_NAME}-${_PKG_VERSION}
-  fi
-}
-
-get_pkg_version() {
-  get_pkg_variable "$1" PKG_VERSION
-}
-
-get_pkg_directory() {
-  get_pkg_variable "$1" PKG_DIR
-}
-
-# get variable ($2) for package ($1)
-get_pkg_variable() {
-  if [ -n "$1" -a -n "$2" ] ; then
-    cd $ROOT
-    . config/options $1
-    echo "${!2}"
-  fi
-}
-
-tolower() {
+tolower(){
   echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
 }
 
@@ -152,6 +70,24 @@ require_eglibc() {
   fi
 }
 
+require_cxx() {
+  if [ "$TOOLCHAIN_CXX" != yes ]; then
+    echo "$1 requires C++ toolchain support, aborting."
+    exit 1
+  fi
+}
+
+xorg_drv_configure_prepend() {
+  incdir=${SYSROOT_PREFIX}/usr/include/xorg
+  for f in dri.h sarea.h dristruct.h exa.h damage.h xf86Module.h; do
+    incfile="$incdir/$f"
+    if [ -f "$incfile" ]; then
+      p=`echo "$incfile" | sed 'y%*+%pp%;s%[^_[:alnum:]]%_%g'`
+      eval "export ac_cv_file_$p=yes"
+    fi
+  done
+}
+
 add_user() {
   # Usage: add_user "username" "password" "userid" "groupid" "description" "home" "shell"
   mkdir -p ${INSTALL}/etc
@@ -223,22 +159,19 @@ do_autoreconf() {
 
 strip_lto() {
   # strip out LTO optimization from *FLAGS
-  if [ -n "$GCC_OPTIM_LTO" ] ; then
-    CFLAGS=`echo $CFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
-    CXXFLAGS=`echo $CXXFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
-    TARGET_CFLAGS=`echo $TARGET_CFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
-    TARGET_CXXFLAGS=`echo $TARGET_CXXFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
-  fi
-  if [ -n "$LD_OPTIM_LTO" ] ; then
-    LDFLAGS=`echo $LDFLAGS | sed -e "s|$LD_OPTIM_LTO||g"`
-    TARGET_LDFLAGS=`echo $TARGET_LDFLAGS | sed -e "s|$LD_OPTIM_LTO||g"`
-  fi
+  CFLAGS=`echo $CFLAGS | sed -e "s|-flto||g"`
+  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-flto||g"`
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-flto||g"`
+}
+
+strip_linker_plugin() {
+  # strip out usage from linker plugin
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||g"`
 }
 
 strip_gold() {
   # strip out usage from GOLD linker
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-ld=gold||g"`
-  TARGET_LDFLAGS=`echo $TARGET_LDFLAGS | sed -e "s|-fuse-ld=gold||g"`
 }
 
 fix_module_depends() {
@@ -258,29 +191,6 @@ fix_module_depends() {
   rm new.modinfo*
 }
 
-# Usage: enable_service <unit> [target]
-enable_service () {
-  local unit="$1"
-  local unit_dir="/usr/lib/systemd/system"
-  local target="$2"
-  local target_dir=$INSTALL
-
-  [ -f "$target_dir/$unit_dir/$unit" ] || exit 1
-  if [ -z "$target" ] ; then
-    for target in `grep '^WantedBy' $target_dir/$unit_dir/$unit | cut -f2 -d=` ; do
-      if [ -n "$target" ]; then
-        mkdir -p ${target_dir}/$unit_dir/${target}.wants
-        ln -sf ../${unit} ${target_dir}/$unit_dir/${target}.wants/
-      fi
-    done
-  fi
-  for target in `grep '^Alias' $target_dir/$unit_dir/$unit | cut -f2 -d=` ; do
-    if [ -n "$target" ]; then
-      ln -sf ${unit} ${target_dir}/$unit_dir/${target}
-    fi
-  done
-}
-
 check_path() {
 dashes="==========================="
   if [ "${PWD##/usr}" != "${PWD}" ]; then
@@ -310,34 +220,14 @@ dashes="==========================="
     exit 1
   fi
 
-  if [ \( -z "$DEVICE" -a -d "$PROJECT_DIR/$PROJECT/devices" \) -o \( -n "$DEVICE" -a ! -d "$PROJECT_DIR/$PROJECT/devices/$DEVICE" \) ]; then
-    check_device="$check_device\n $dashes$dashes$dashes"
-    check_device="$check_device\n ERROR: You need to specify a valid device for the $PROJECT project"
-    check_device="$check_device\n $dashes$dashes$dashes"
-    check_device="$check_device\n\n Valid devices for project: $PROJECT"
-
-    for device in $PROJECT_DIR/$PROJECT/devices/*; do
-      check_device="$check_device\n - $(basename $device)"
-    done
-    echo -e $check_device
-    exit 1
-  fi
-
-  if [ -d $PROJECT_DIR/$PROJECT/devices/$DEVICE/linux ]; then
-    linux_config_dir="$PROJECT_DIR/$PROJECT/devices/$DEVICE/linux"
-  else
-    linux_config_dir="$PROJECT_DIR/$PROJECT/linux"
-  fi
-
-  if [ ! -f $linux_config_dir/linux.$TARGET_ARCH.conf ] &&
-     ! ls $linux_config_dir/*/linux.$TARGET_ARCH.conf &>/dev/null; then
+  if [ ! -f $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf ]; then
     check_arch="$check_arch\n $dashes$dashes$dashes"
     check_arch="$check_arch\n ERROR: Architecture not found, use a valid Architecture"
     check_arch="$check_arch\n for your project or create a new config"
     check_arch="$check_arch\n $dashes$dashes$dashes"
     check_arch="$check_arch\n\n Valid Architectures for your project: $PROJECT"
 
-    for arch in $linux_config_dir/*.conf $linux_config_dir/*/linux.$TARGET_ARCH.conf; do
+    for arch in $PROJECT_DIR/$PROJECT/linux/*.conf; do
       check_arch="$check_arch\n - $(basename $arch | cut -f2 -d".")"
     done
     echo -e $check_arch
@@ -346,12 +236,9 @@ dashes="==========================="
 }
 
 show_config() {
-  # load graphic configuration
-    get_graphicdrivers
-
   dashes="==========================="
   config_message="$config_message\n $dashes$dashes$dashes"
-  config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community"))"
+  config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "unofficial"))"
   config_message="$config_message\n $dashes$dashes$dashes"
 
   # Build options
@@ -363,6 +250,7 @@ show_config() {
   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 - SIMD support:\t\t\t $SIMD_SUPPORT"
+  config_message="$config_message\n - Optimizations:\t\t\t $OPTIMIZATIONS"
   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"
@@ -375,23 +263,25 @@ show_config() {
   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 - XORG support:\t\t\t $XORG_SUPPORT"
+  config_message="$config_message\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT"
+  config_message="$config_message\n - XORG Xinerama support:\t\t $XINERAMA_SUPPORT"
+  config_message="$config_message\n - SDL support:\t\t\t\t $SDL_SUPPORT"
   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"
+  config_message="$config_message\n - WindowManager:\t\t\t $WINDOWMANAGER"
+  config_message="$config_message\n - Xorg Graphic Drivers:\t\t $GRAPHIC_DRIVERS"
 
   # Hardware decoder support
 
   config_message="$config_message\n\n Hardware decoder configuration:"
   config_message="$config_message\n $dashes$dashes"
 
-  config_message="$config_message\n - Kodi Player driver:\t\t\t $KODIPLAYER_DRIVER"
-  config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI_SUPPORT"
-  config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU_SUPPORT"
+  config_message="$config_message\n - Broadcom CrystalHD Decoder:\t\t $CRYSTALHD"
+  config_message="$config_message\n - XBMC Player driver:\t\t\t $XBMCPLAYER_DRIVER"
+  config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI"
+  config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU"
+  config_message="$config_message\n - XVBA Support:\t\t\t $XVBA"
 
   # Input device configuration
 
@@ -401,7 +291,8 @@ show_config() {
   config_message="$config_message\n - Remote support:\t\t\t $REMOTE_SUPPORT"
   config_message="$config_message\n - ATV Remote support:\t\t\t $ATVCLIENT_SUPPORT"
   config_message="$config_message\n - CEC Adapter support:\t\t\t $CEC_SUPPORT"
-  config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT"
+  config_message="$config_message\n - IRTrans support:\t\t\t $IRSERVER_SUPPORT"
+  config_message="$config_message\n - XBMC Joystick support:\t\t $JOYSTICK_SUPPORT"
 
   # Misc. hardware configuration
 
@@ -410,7 +301,10 @@ show_config() {
 
   config_message="$config_message\n - ALSA support:\t\t\t $ALSA_SUPPORT"
   config_message="$config_message\n - Pulseaudio support:\t\t\t $PULSEAUDIO_SUPPORT"
+  config_message="$config_message\n - Blu-Ray support:\t\t\t $BLURAY_SUPPORT"
   config_message="$config_message\n - Bluetooth support:\t\t\t $BLUETOOTH_SUPPORT"
+  config_message="$config_message\n - Hardware Sensors support:\t\t $SENSOR_SUPPORT"
+  config_message="$config_message\n - LCD drivers:\t\t\t\t $LCD_DRIVER"
 
   for config_driver in $ADDITIONAL_DRIVERS; do
     config_message="$config_message\n - Include driver:\t\t\t $config_driver"
@@ -420,21 +314,22 @@ show_config() {
     config_message="$config_message\n - Include firmware:\t\t\t $config_firmware"
   done
 
-  for config_modules in $INITRAMFS_MODULES; do
-    config_message="$config_message\n - Initramfs modules:\t\t\t $config_modules"
-  done
-
   # Network service configuration
 
   config_message="$config_message\n\n Network service configuration:"
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - Avahi (Zeroconf) support:\t\t $AVAHI_DAEMON"
-  config_message="$config_message\n - NFS mounting support:\t\t $NFS_SUPPORT"
-  config_message="$config_message\n - SAMBA mounting support:\t\t $SAMBA_SUPPORT"
   config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER"
   config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER"
+  config_message="$config_message\n - PPTP support:\t\t\t $PPTP_SUPPORT"
   config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
+  config_message="$config_message\n - XBMC Airplay support:\t\t $AIRPLAY_SUPPORT"
+  config_message="$config_message\n - XBMC Airtunes support:\t\t $AIRTUNES_SUPPORT"
+  config_message="$config_message\n - XBMC AFP support:\t\t\t $AFP_SUPPORT"
+  config_message="$config_message\n - XBMC NFS support:\t\t\t $NFS_SUPPORT"
+  config_message="$config_message\n - XBMC SAMBA client support:\t\t $SAMBA_CLIENT"
+  config_message="$config_message\n - XBMC Webserver support:\t\t $WEBSERVER"
 
   # OS configuration
 
@@ -442,13 +337,15 @@ show_config() {
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - OEM Support:\t\t\t\t $OEM_SUPPORT"
+  config_message="$config_message\n - Default Hostname:\t\t\t $HOSTNAME"
   config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD"
   config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER"
-  if [ "$BOOTLOADER" = "u-boot" ]; then
-    config_message="$config_message\n   - U-Boot configuration:\t\t $UBOOT_CONFIG"
-    config_message="$config_message\n   - U-Boot config file:\t\t $UBOOT_CONFIGFILE"
-  fi
-  config_message="$config_message\n - UDevil support:\t\t\t $UDEVIL"
+if [ "$BOOTLOADER" = "u-boot" ]; then
+  config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG"
+  config_message="$config_message\n - U-Boot config file:\t\t\t $UBOOT_CONFIGFILE"
+fi
+  config_message="$config_message\n - UDisks support:\t\t\t $UDISKS"
+  config_message="$config_message\n - UPower support:\t\t\t $UPOWER"
   config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
 
   # Misc. Filesystems
@@ -457,43 +354,31 @@ show_config() {
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - Swap Support:\t\t\t $SWAP_SUPPORT"
-  if [ "$SWAP_SUPPORT" = "yes" ]; then
-    config_message="$config_message\n   - Swapfile default size:\t\t $SWAPFILESIZE"
-  fi
+if [ "$SWAP_SUPPORT" = "yes" ]; then
+  config_message="$config_message\n - Swapfile default size:\t\t $SWAPFILESIZE"
+fi
   config_message="$config_message\n - exFAT Support (via Fuse):\t\t $EXFAT"
   config_message="$config_message\n - NTFS Support (via Fuse):\t\t $NTFS3G"
   config_message="$config_message\n - Install HFS Tools:\t\t\t $HFSTOOLS"
 
-  # Kodi configuration
+  # XBMC configuration
 
-  config_message="$config_message\n\n Kodi configuration:"
+  config_message="$config_message\n\n XBMC configuration:"
   config_message="$config_message\n $dashes$dashes"
 
-  config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER"
-  config_message="$config_message\n - Kodi nonfree support:\t\t $KODI_NONFREE_SUPPORT"
-  config_message="$config_message\n - Kodi Blu-Ray support:\t\t $KODI_BLURAY_SUPPORT"
-  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 SSH client support:\t\t $KODI_SSHLIB_SUPPORT"
-  config_message="$config_message\n - Kodi UPNP support:\t\t\t $KODI_UPNP_SUPPORT"
-  config_message="$config_message\n - Kodi Webserver support:\t\t $KODI_WEBSERVER_SUPPORT"
-
+  config_message="$config_message\n - XBMC version:\t\t\t $MEDIACENTER"
+  config_message="$config_message\n - XBMC nonfree support:\t\t $NONFREE_SUPPORT"
+  config_message="$config_message\n - XBMC DVDCSS support:\t\t\t $DVDCSS_SUPPORT"
 
   for config_skin in $SKINS; do
     config_message="$config_message\n - Include Skin:\t\t\t $config_skin"
   done
 
   config_message="$config_message\n - Default Skin:\t\t\t $SKIN_DEFAULT"
-  config_message="$config_message\n - Include extra fonts:\t\t\t $KODI_EXTRA_FONTS"
+  config_message="$config_message\n - Include extra fonts:\t\t\t $XBMC_EXTRA_FONTS"
+  config_message="$config_message\n - Include RSXS Screensaver:\t\t $XBMC_SCR_RSXS"
+  config_message="$config_message\n - Include ProjectM Visualization:\t $XBMC_VIS_PROJECTM"
+  config_message="$config_message\n - Include Goom Visualization:\t\t $XBMC_VIS_GOOM"
 
   config_message="$config_message\n"
   config_message="$config_message\n $dashes$dashes$dashes"
@@ -501,17 +386,5 @@ show_config() {
   config_message="$config_message\n $dashes$dashes$dashes"
   config_message="$config_message\n\n\n"
 
-  echo -e "$config_message"
+  echo -e $config_message
 }
-
-# strip
-debug_strip() {
-  if [ ! "$DEBUG" = yes ]; then
-    find $* -type f -executable | xargs $STRIP 1>/dev/null || :
-  fi
-}
-
-# Use distribution functions if any
-if [ -f "distributions/$DISTRO/config/functions" ]; then
-  . distributions/$DISTRO/config/functions
-fi

config/graphic

@@ -1,3 +1,9 @@
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
+  SDL_SUPPORT="yes"
+else
+  SDL_SUPPORT="no"
+fi
+
 if [ "$OPENGL" = no ]; then
   OPENGL_SUPPORT="no"
 else
@@ -10,70 +16,102 @@ 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() {
   if [ "$GRAPHIC_DRIVERS" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware virtualbox"
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx fglrx-legacy nvidia vmware virtualbox"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do
+    if [ "$drv" = "dove" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS dove"
+    fi
+
+    if [ "$drv" = "fglrx" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS fglrx"
+      COMPOSITE_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "fglrx-legacy" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS fglrx-legacy"
+      COMPOSITE_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
+    fi
+
     if [ "$drv" = "i915" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i915"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
       XORG_DRIVERS="$XORG_DRIVERS intel"
-      COMPOSITE_SUPPORT="yes"
-      VAAPI_SUPPORT="yes"
+#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "i965" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i965"
       XORG_DRIVERS="$XORG_DRIVERS intel"
-      COMPOSITE_SUPPORT="yes"
-      VAAPI_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "nouveau" ]; then
+#      DRI_DRIVERS="$DRI_DRIVERS,nouveau"
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
+      XORG_DRIVERS="$XORG_DRIVERS nouveau"
+#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nvidia" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia"
-      VDPAU_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nvidia-legacy" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
-      VDPAU_SUPPORT="yes"
+      XINERAMA_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "virtualbox" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,swrast"
+      XORG_DRIVERS="$XORG_DRIVERS virtualbox"
+      XINERAMA_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "omapfb" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,swrast"
+#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
+      XORG_DRIVERS="$XORG_DRIVERS ompafb"
+#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r200" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,r200"
       XORG_DRIVERS="$XORG_DRIVERS ati"
-      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r300" ]; then
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
-      COMPOSITE_SUPPORT="yes"
-      VDPAU_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r600" ]; then
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
-      COMPOSITE_SUPPORT="yes"
-      VDPAU_SUPPORT="yes"
-    fi
-
-    if [ "$drv" = "radeonsi" ]; then
-      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,radeonsi"
-      XORG_DRIVERS="$XORG_DRIVERS ati amdgpu"
-      LLVM_SUPPORT="yes"
-      COMPOSITE_SUPPORT="yes"
-      VDPAU_SUPPORT="yes"
     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
 

config/noobs/os.json

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

config/noobs/partition_setup.sh

@@ -1,67 +0,0 @@
-#!/bin/sh -x
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-MOUNTPOINT="/tmp/LibreELEC-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 "#######################################################"
-      exit 1
-    fi
-    rm -rf $1.md5
-  )
-}
-
-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
-  echo "part2:" $part2
-  echo "id1  :" $id1
-  echo "id2  :" $id2
-  exit 1
-fi
-
-# create mountpoint
-  mkdir -p $MOUNTPOINT
-
-# mount needed partition
-  mount $part1 $MOUNTPOINT
-
-# check md5sum
-  md5sumCheck kernel.img
-  md5sumCheck SYSTEM
-
-# create bootloader configuration
-  echo "creating bootloader configuration..."
-  echo "boot=$id1 disk=$id2 quiet" > $MOUNTPOINT/cmdline.txt
-
-# cleanup mountpoint
-  umount $MOUNTPOINT
-  rmdir $MOUNTPOINT

config/noobs/partitions.json

@@ -1,20 +0,0 @@
-{
-  "partitions": [
-    {
-      "label":                     "@DISTRONAME@_@PROJECT@_System",
-      "filesystem_type":           "FAT",
-      "partition_size_nominal":    @SYSTEM_SIZE@,
-      "want_maximised":            false,
-      "uncompressed_tarball_size": 120,
-      "mkfs_options":              ""
-    },
-    {
-      "label":                     "@DISTRONAME@_@PROJECT@_Storage",
-      "filesystem_type":           "ext4",
-      "partition_size_nominal":    512,
-      "want_maximised":            true,
-      "uncompressed_tarball_size": 10,
-      "mkfs_options":              ""
-    }
-  ]
-}

config/optimize

@@ -1,13 +1,36 @@
-GCC_OPTIM="-Os"
-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 [ "$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_LTO="-flto -ffat-lto-objects"
-  LD_OPTIM_LTO="-fuse-linker-plugin -flto"
+  GCC_OPTIM="$GCC_OPTIM -flto"
+  LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
+  LD_OPTIM="$LD_OPTIM -flto"
 fi
 
 if [ "$GOLD_SUPPORT" = yes ];then
-  LD_OPTIM_GOLD="-fuse-ld=gold"
+  LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
 fi
 
 if [ "$DEBUG" = yes ]; then
@@ -17,13 +40,13 @@ if [ "$DEBUG" = yes ]; then
 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
 
 TARGET_CPPFLAGS=
-TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $GCC_OPTIM_LTO $PROJECT_CFLAGS"
+TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
 TARGET_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $GCC_OPTIM"
 TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
 TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
 
@@ -33,11 +56,6 @@ HOST_CXXFLAGS="$HOST_CFLAGS"
 HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
 HOST_LIBDIR="$ROOT/$TOOLCHAIN/lib"
 
-# work around Ubuntu default C*FLAGS 
-# see https://wiki.ubuntu.com/ToolChain/CompilerFlags#A-Wformat_-Wformat-security
-HOST_CFLAGS="$HOST_CFLAGS -Wno-format-security"
-HOST_CXXFLAGS="$HOST_CXXFLAGS -Wno-format-security" 
-
 # add distro specific library dirs
   # ubuntu/debian specific "multiarch support"
     FAMILY_TRIPLET=$(echo $HOST_NAME | sed -e "s,$(uname -m),$(uname -i),")

config/options

@@ -1,14 +1,6 @@
 # set default language for buildsystem
   export LC_ALL=C
 
-# determines DISTRO, if not forced by user
-# default is LibreELEC
-if [ -z "$DISTRO" ]; then
-  DISTRO="LibreELEC"
-else
-  DISTRO="$DISTRO"
-fi
-
 # determines PROJECT, if not forced by user
 # default is Generic
 if [ -z "$PROJECT" ]; then
@@ -17,88 +9,72 @@ else
   PROJECT="$PROJECT"
 fi
 
-# determines TARGET_ARCH, if not forced by user (x86_64 / arm)
-# default is x86_64
+# determines TARGET_ARCH, if not forced by user (i386 / x86_64 / arm)
+# default is i386
 if [ -z "$ARCH" ]; then
-  TARGET_ARCH="x86_64"
+  TARGET_ARCH="i386"
 else
   TARGET_ARCH="$ARCH"
 fi
 
 ROOT=`pwd`
-DISTRO_DIR="$ROOT/distributions"
 PROJECT_DIR="$ROOT/projects"
-LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $PROJECT_DIR/$PROJECT/devices/$DEVICE/linux/linux.$TARGET_ARCH.conf $ROOT/packages/linux/package.mk"
-[ "$TARGET_ARCH" = "x86_64" ] && LINUX_DEPENDS+=" $ROOT/packages/linux-firmware/intel-ucode/package.mk $ROOT/packages/linux-firmware/x86-firmware/package.mk"
 
 # include versioning
   . config/version
 
-# read distro versioning if available
- if [ -f "$DISTRO_DIR/$DISTRO/version" ]; then
-   . $DISTRO_DIR/$DISTRO/version
- fi
-
-# read distro options if available
- if [ -f "$DISTRO_DIR/$DISTRO/options" ]; then
-   . $DISTRO_DIR/$DISTRO/options
- fi
-
 # read project options if available
  if [ -f "$PROJECT_DIR/$PROJECT/options" ]; then
    . $PROJECT_DIR/$PROJECT/options
  fi
 
-# read board options if available
- if [ -f "$PROJECT_DIR/$PROJECT/devices/$DEVICE/options" ]; then
-   . $PROJECT_DIR/$PROJECT/devices/$DEVICE/options
- fi
+# Target system library C (eglibc)
+  TARGET_LIBC="eglibc"
+
+# Library strip
+  LIBSTRIP="yes"
 
 # Need to point to your actual cc
 # If you have ccache installed, take care that LOCAL_CC don't point to it
   LOCAL_CC=`which gcc`
 
-if [ -z "$LOCAL_CC" ] ; then
-  echo "***** Please install gcc *****"
-  exit 127
-fi
-
 # Need to point to your actual g++
 # If you have ccache installed, take care that LOCAL_CXX don't point to it
   LOCAL_CXX=`which g++`
 
+# Support C++ in toolchain
+  TOOLCHAIN_CXX="yes"
+
 # verbose compilation mode (yes/no)
   VERBOSE="yes"
 
 # Concurrency make level (-j option)
 #  Try value 1 (default) to 4 on single CPU computer, or more on
 #  multi-processor computer (like hyperthreading SMP CPU)
-  if test -z "${CONCURRENCY_MAKE_LEVEL}"; then
-    CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
-  fi
+  CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
 
 # cache size for ccache
 # Set the maximum size of the files stored in the cache. You can specify a
 # 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 options from $HOME if available
-  if [ -f "$HOME/.libreelec/options" ]; then
-    . $HOME/.libreelec/options
-  fi
+# forcing install of all packages (yes/no)
+  FORCE_INSTALL="no"
 
 # install devtools on development builds
-  if [ -z "$DEVTOOLS" -a "$LIBREELEC_VERSION" = "devel" ]; then
+  if [ "$OPENELEC_VERSION" = "devel" ]; then
     DEVTOOLS=yes
   fi
 
-# overwrite OEM_SUPPORT via commandline
-if [ "$OEM" = yes -o "$OEM" = no ]; then
-  OEM_SUPPORT=$OEM
-fi
+# 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

config/path

@@ -1,7 +1,5 @@
 set -e
 
-. config/functions
-
 # setup initial directorys (relative to root)
   CONFIG=config
   SCRIPTS=scripts
@@ -17,24 +15,9 @@ set -e
   fi
 
 HOST_NAME=`$LOCAL_CC -dumpmachine`
-TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI}
-
-if [ -n "$DEVICE" ]; then
-  BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION
-  if [ "$LIBREELEC_VERSION" = "devel" ] ; then
-    BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
-  fi
-else
-  BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION
-  if [ "$LIBREELEC_VERSION" = "devel" ] ; then
-    BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
-  fi
-fi
-
-if [ -n "$BUILD_SUFFIX" ]; then
-  BUILD=$BUILD-$BUILD_SUFFIX
-fi
+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"
@@ -47,12 +30,7 @@ SYSROOT_PREFIX=$ROOT/$TOOLCHAIN/$TARGET_NAME/sysroot
 LIB_PREFIX=$SYSROOT_PREFIX/usr
 TARGET_PREFIX=$ROOT/$TOOLCHAIN/bin/$TARGET_NAME-
 
-FAKEROOT_SCRIPT=$ROOT/.fakeroot.$BUILD
-
-if [ -z "$INSTALL" ]; then
-  INSTALL=$BUILD/image/system
-fi
-INSTALL_INIT=$BUILD/image/initramfs/root-image
+FAKEROOT_SCRIPT=$ROOT/.fakeroot.$PROJECT.$TARGET_ARCH
 
 . config/sources
 
@@ -68,114 +46,44 @@ SED="sed -i"
   PKG_LICENSE="unknown"
   PKG_SITE=""
   PKG_URL=""
-  PKG_SOURCE_NAME=""
-  PKG_SOURCE_DIR=""
-  PKG_DEPENDS_TARGET=""
-  PKG_DEPENDS_HOST=""
-  PKG_DEPENDS_INIT=""
-  PKG_DEPENDS_BOOTSTRAP=""
+  PKG_DEPENDS=""
+  PKG_BUILD_DEPENDS=""
+  PKG_PRIORITY="optional"
   PKG_SECTION=""
   PKG_SHORTDESC="$1 (autogenerated)"
   PKG_LONGDESC=""
   PKG_IS_ADDON="no"
-  PKG_PATCH_DIRS=""
 
   if [ -n "$1" ]; then
-    _PKG_ROOT_NAME=${1%:*}
-    _ALL_DIRS=""
-    _FOUND=0
-    _ANCHOR="@?+?@"
-    PKG_DIR=""
-
-    # If the package caches are unset, then populate them
-    if [ -z "${_CACHE_PACKAGE_LOCAL+x}" -o -z "${_CACHE_PACKAGE_GLOBAL+x}" ]; then
-      _CACHE_PACKAGE_LOCAL=""
-      _CACHE_PACKAGE_GLOBAL=""
-
-      # cache project folder for a package
-      for DIR in $(find $ROOT/projects/$PROJECT/packages -type d 2>/dev/null); do
-        [ -r "$DIR/package.mk" ] && _CACHE_PACKAGE_LOCAL+="${DIR}${_ANCHOR}\n"
-      done
-
-      # cache packages folder
-      for DIR in $(find $ROOT/$PACKAGES -type d 2>/dev/null); do
-        [ -r "$DIR/package.mk" ] && _CACHE_PACKAGE_GLOBAL+="${DIR}${_ANCHOR}\n"
-      done
-
-      export _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL
-    fi
-
-    # Check for any available local package in preference to a global package
-    for DIR in $(echo -e "${_CACHE_PACKAGE_LOCAL}" | grep -F "/${_PKG_ROOT_NAME}${_ANCHOR}"); do
-      DIR="${DIR%${_ANCHOR}}"
-      # found first, set $PKG_DIR
-      PKG_DIR="$DIR"
-      # keep track of dirs with package.mk for detecting multiple folders
-      _ALL_DIRS+="${DIR}\n"
-      _FOUND=$((_FOUND+1))
-    done
-
-    # If there's no local package available, use the global package
-    if [ $_FOUND -eq 0 ]; then
-      for DIR in $(echo -e "${_CACHE_PACKAGE_GLOBAL}" | grep -F "/${_PKG_ROOT_NAME}${_ANCHOR}"); do
-        DIR="${DIR%${_ANCHOR}}"
-        # found first, set $PKG_DIR
+    FOUND=0
+    for DIR in `find $PACKAGES -type d -name $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/meta" -o -f "$DIR/install" -o -f "$DIR/build" ] ; then
+        FOUND=$((FOUND+1))
+        # found first. set $PKG_DIR
         PKG_DIR="$DIR"
-        # keep track of dirs with package.mk for detecting multiple folders
-        _ALL_DIRS+="${DIR}\n"
-        _FOUND=$((_FOUND+1))
-      done
-    fi
-
-    # _FOUND multiple packages? fail
-    if [ $_FOUND -gt 1 ]; then
-      echo "Error - multiple package folders:"
-      echo -e "$_ALL_DIRS"
-      exit 1
-    fi
-  fi
-
-  if [ -n "$PKG_DIR" -a -r $PKG_DIR/package.mk ]; then
-    . $PKG_DIR/package.mk
+        if [ $FOUND -gt 1 ] ; then
+          # found more ? fail
+          echo "Error - multiple package folders:"
+          echo -e "$ALL_DIRS"
+          exit 1
+        fi
+      fi
+    done
   fi
 
+  [ -r $PKG_DIR/meta ] && . $PKG_DIR/meta
   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
 
-  # Automatically set PKG_SOURCE_NAME unless it is already defined.
-  # PKG_SOURCE_NAME will be automatically set to a name based on
-  # the $PKG_NAME-$PKG_VERSION convention.
-  #
-  # Any $PKG_URL that references more than a single url will abort
-  # the build as these are no longer supported - use mkpkg instead.
-  if [ -n "$PKG_URL" -a -z "$PKG_SOURCE_NAME" ]; then
-    if [[ $PKG_URL =~ .*\ .* ]]; then
-      echo "Error - packages with multiple urls are no longer supported, use mkpkg:"
-      echo "$PKG_URL"
-      exit 1
-    fi
-    PKG_SOURCE_NAME="$(basename "$PKG_URL")"
-    case $PKG_SOURCE_NAME in
-      ${PKG_NAME}-${PKG_VERSION}.*)
-        PKG_SOURCE_NAME=$PKG_SOURCE_NAME
-        ;;
-      *.tar | *.tbz | *.tgz | *.txz | *.7z | *.zip)
-        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.${PKG_SOURCE_NAME##*\.}
-        ;;
-      *.tar.bz2 | *.tar.gz | *.tar.xz)
-        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.tar.${PKG_SOURCE_NAME##*\.}
-        ;;
-       *.diff | *.patch | *.diff.bz2 | *.patch.bz2 | patch-*.bz2 | *.diff.gz | *.patch.gz | patch-*.gz)
-        PKG_SOURCE_NAME=$PKG_SOURCE_NAME
-        ;;
-      *)
-        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.${PKG_SOURCE_NAME##*\.}
-        ;;
-    esac
-  fi
-
-  PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
+  [ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
+  [ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
 
 XORG_PATH_DRI=/usr/lib/dri
 XORG_PATH_XKB=/usr/share/X11/xkb
@@ -184,16 +92,51 @@ 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=$ROOT/$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:$ROOT/$TOOLCHAIN/sbin:$PATH"
+  export PATH="$ROOT/$TOOLCHAIN/bin:$PATH"
 fi
 
 if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$ROOT/$TOOLCHAIN/lib:}" ]; then
@@ -201,10 +144,13 @@ if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$ROOT/$TOO
 fi
 
 VERSION_SUFFIX=$TARGET_ARCH
+. config/functions
 
 check_path
 check_config
 
+setup_toolchain target
+
 SILENT_OUT=3
 VERBOSE_OUT=4
 if [ "$VERBOSE" = yes ]; then
@@ -215,29 +161,3 @@ else
   exec 4>/dev/null
 fi
 BUILD_INDENT_SIZE=4
-
-# define colors
-  black="\e[0;30m"
-  boldblack="\e[1;30m"
-  red="\e[0;31m"
-  boldred="\e[1;31m"
-  green="\e[0;32m"
-  boldgreen="\e[1;32m"
-  yellow="\e[0;33m"
-  boldyellow="\e[1;33m"
-  blue="\e[0;34m"
-  boldblue="\e[1;34m"
-  magenta="\e[0;35m"
-  boldmagenta="\e[1;35m"
-  cyan="\e[0;36m"
-  boldcyan="\e[1;36m"
-  white="\e[0;37m"
-  boldwhite="\e[1;37m"
-  endcolor="\e[0m"
-
-# multilib? nah
-unset CONFIG_SITE
-
-# meh suse
-unset PYTHONSTARTUP
-unset PYTHONPATH

config/release/Autorun.inf

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

config/version

@@ -1,9 +1,9 @@
 # VERSION: set full version, use "devel" for development version
-  LIBREELEC_VERSION="8.0.1"
+  OPENELEC_VERSION="3.1.3"
 
 # OS_VERSION: OS Version
-  OS_VERSION="8.0"
+  OS_VERSION="3.2"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="8.1"
+  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,198 +0,0 @@
-# LTO (Link Time Optimization) support
-  LTO_SUPPORT="yes"
-
-# GOLD (Google Linker) support
-  GOLD_SUPPORT="yes"
-
-# 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="#            http://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"
-
-# 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 non-free support
-# (RAR compression support in KODI) (yes / no)
-  KODI_NONFREE_SUPPORT="yes"
-
-# build and install with BluRay support (yes / no)
-  KODI_BLURAY_SUPPORT="yes"
-
-# build and install with BD+ support
-# (BD+ decryption support in KODI) (yes / no)
-  BLURAY_BDPLUS_SUPPORT="yes"
-
-# build and install with AACS support
-# (BD decryption support in KODI) (yes / no)
-  BLURAY_AACS_SUPPORT="yes"
-
-# build and install with DVDCSS support
-# (DVD decryption support in KODI) (yes / no)
-  KODI_DVDCSS_SUPPORT="yes"
-
-# additional drivers to install:
-# for a list of additinoal drivers see packages/linux-drivers
-# Space separated list is supported,
-# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU 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 (yes / no)
-  KODI_MYSQL_SUPPORT="yes"
-
-# build xbmc with sshlib support (yes / no)
-  KODI_SSHLIB_SUPPORT="yes"
-
-# build xbmc with optical drive support (yes / no)
-  KODI_OPTICAL_SUPPORT="yes"
-
-# 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 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"
-
-# build and install remote support (yes / no)
-  REMOTE_SUPPORT="yes"
-
-# build and install ATV IR remote support (yes / no)
-  ATVCLIENT_SUPPORT="yes"
-
-# build and install Joystick support (yes / no)
-  JOYSTICK_SUPPORT="yes"
-
-# build and install CEC adapter support (yes / no)
-  CEC_SUPPORT="yes"
-
-# build and install iSCSI support - iscsistart (yes / no)
-  ISCSI_SUPPORT="yes"
-
-# Support for partitioning and formating disks in initramfs (yes / no)
-# This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
-  INITRAMFS_PARTED_SUPPORT="no"
-
-# build with swap support (yes / no)
-  SWAP_SUPPORT="no"
-
-# swap support enabled per default (yes / no)
-  SWAP_ENABLED_DEFAULT="no"
-
-# swapfile size if SWAP_SUPPORT=yes in MB
-  SWAPFILESIZE="256"
-
-# build with installer (yes / no)
-  INSTALLER_SUPPORT="yes"
-
-# Testpackages for development (yes / no)
-  TESTING="no"
-
-# OEM packages for OEM's (yes / no)
-  OEM_SUPPORT="no"
-
-# build and install nano text editor (yes / no)
-  NANO_EDITOR="yes"
-
-# cron support (yes / no)
-  CRON_SUPPORT="yes"
-
-# 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="http://addons.libreelec.tv"
-
-# set the addon dirs
-  ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
-  ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"
-
-# Default size of system partition, in MB, eg. 512
-  SYSTEM_SIZE=512
-# Default system partition offset, in sectors, eg. 2048
-  SYSTEM_PART_START=2048

packages/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"

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

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

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

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

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

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

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

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

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

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

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

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

packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-03_ffdecsa.patch

@@ -0,0 +1,16 @@
+diff --git a/Makefile b/Makefile
+index 278af2b..996dc77 100644
+--- a/Makefile
++++ b/Makefile
+@@ -85,8 +85,9 @@ OBJS = CAPMT.o DeCSA.o DeCsaTSBuffer.o dll.o DVBAPI.o DVBAPISetup.o SCDeviceProb
+ 
+ ifndef LIBDVBCSA
+ # FFdeCSA
+-PARALLEL   ?= PARALLEL_128_SSE2
+-CSAFLAGS   ?= -fexpensive-optimizations -funroll-loops -mmmx -msse -msse2 -msse3
++CPUOPT     ?= pentium
++PARALLEL   ?= PARALLEL_32_INT
++CSAFLAGS   ?= -Wall -fPIC -g -O3 -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops
+ FFDECSADIR  = FFdecsa
+ FFDECSA     = $(FFDECSADIR)/FFdecsa.o
+ DECSALIB    = $(FFDECSA)

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

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