config/version: set version to 4.0.6

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

.gitignore

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

.gitmodules

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

CHANGELOG

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

CONTRIBUTING.md

@@ -1,20 +1,20 @@
-### 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], on IRC: 
+\#openelec on freenode.net, or [webchat]. 
 
 Do not open an issue.
 
 ### Issue Reports
 
 **BEFORE you report a bug make sure you got the latest testing version of 
-LibreELEC. Your bug might be already fixed.**
+OpenELEC. Your bug might be already fixed.**
 
-If you are at all unsure whether it's a bug in LibreELEC or a problem with 
-something else, post in the LibreELEC [Forum] instead. If it turns out that it is
+If you are at all unsure whether it's a bug in OpenELEC or a problem with 
+something else, post in the OpenELEC [Forum] instead. If it turns out that it is
 a bug, an issue can always be opened later.
 
-If you are sure that it's a bug in LibreELEC and you have not found a [similar issue], open a new [issue]
+If you are sure that it's a bug in OpenELEC and you have not found a [similar issue], open a new [issue]
 and try to answer the following questions:
 - What did you do?
 - What did you expect to happen?
@@ -23,23 +23,17 @@ and try to answer the following questions:
 **It is also importent to provide logs for debugging.
 A zip file can be found in the [logfiles] samba share, this will contain all the logs needed.**
 
-Make sure to specify which version of LibreELEC you are using.
-- LibreELEC version
-- LibreELEC build
-- LibreELEC arch
+Make sure to specify which version of OpenELEC you are using.
+- OpenELEC version
+- OpenELEC build
+- OpenELEC arch
 
 Please don't paste log messages in the issue reports or issue comments - use 
 [sprunge.us](http://sprunge.us) instead.
 
 Feature requests are great, but they usually end up lying around the issue
 tracker indefinitely. Sending a pull request is a much better way of getting a
-particular feature into LibreELEC.
-
-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.
+particular feature into OpenELEC.
 
 ### Reporting build failures
 
@@ -66,11 +60,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 +98,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

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

README.md

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

config/addon/addon.xml

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="@PKG_ADDON_ID@"
-       name="@ADDON_NAME@"
+       name="@PKG_NAME@"
        version="@ADDON_VERSION@"
        provider-name="@PROVIDER_NAME@">
   <requires>
-    <import addon="os.libreelec.tv" version="@OS_VERSION@"/>
+    <import addon="os.openelec.tv" version="@OS_VERSION@"/>
     <import addon="xbmc.python" version="2.1.0"/>
 @REQUIRES@
   </requires>
-  <extension point="xbmc.python.script" library="default.py">
-    <provides>@PKG_ADDON_PROVIDES@</provides>
+  <extension point="@PKG_ADDON_TYPE@"
+             library="default.py">
+        <provides>executable</provides>
   </extension>
   <extension point="xbmc.addon.metadata">
     <summary>@PKG_SHORTDESC@</summary>

config/addon/xbmc.python.module.xml

@@ -1,24 +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>
-  </extension>
-</addon>

config/addon/xbmc.service.pluginsource.xml

@@ -1,26 +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>
-  </extension>
-</addon>

config/addon/xbmc.service.xml

@@ -1,24 +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>
-  </extension>
-</addon>

config/arch.aarch64

@@ -1,29 +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_CPU_FLAGS="+crc+crypto"
-      TARGET_EXTRA_FLAGS="-mcpu=${TARGET_CPU}${TARGET_CPU_FLAGS}"
-      SIMD_SUPPORT="yes"
-      ;;
-  esac
-
-  TARGET_GCC_ARCH=${TARGET_SUBARCH/-}
-  TARGET_KERNEL_ARCH=arm64
-
-# setup ARCH specific *FLAGS
-  TARGET_CFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mabi=lp64 -Wno-psabi $TARGET_EXTRA_FLAGS"
-  TARGET_LDFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mtune=$TARGET_CPU"
-  GCC_OPTS="--with-abi=lp64 --with-arch=$TARGET_VARIANT"

config/arch.arm

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

config/arch.i386

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

@@ -1,9 +1,12 @@
 setup_toolchain() {
+  if [ "$1" = "--optimize" ]; then
+    OPTIMIZE=yes
+    shift
+  fi
+
   if [ "$1" = target ]; then
     export DESTIMAGE="target"
 
-    unset CPP
-
     export CC=$TARGET_CC
     export CXX=$TARGET_CXX
     export LD=$TARGET_LD
@@ -22,19 +25,12 @@ setup_toolchain() {
     export PKG_CONFIG_LIBDIR="$TARGET_PKG_CONFIG_LIBDIR"
     export PKG_CONFIG_SYSROOT_DIR="$TARGET_PKG_CONFIG_SYSROOT_DIR"
 
-  # set python defaults
-    export _python_sysroot="$SYSROOT_PREFIX"
-    export _python_prefix=/usr
-    export _python_exec_prefix=/usr
-
   # set CMAKE configfile for target
     export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf
 
   elif [ "$1" = host ]; then
     export DESTIMAGE="host"
 
-    unset CPP
-
     export AWK=$HOST_AWK
     export CC=$HOST_CC
     export CXX=$HOST_CXX
@@ -60,30 +56,12 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  if [ -e $HOME/.libreelec/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $HOME/.libreelec/projects/$PROJECT/packages/linux/package.mk
-  elif [ -e $HOME/.libreelec/packages/linux/package.mk ]; then
-    . $HOME/.libreelec/packages/linux/package.mk
-  elif [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
+  . $ROOT/packages/linux/package.mk
   echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
 }
 
 kernel_version() {
-  if [ -e $HOME/.libreelec/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $HOME/.libreelec/projects/$PROJECT/packages/linux/package.mk
-  elif [ -e $HOME/.libreelec/packages/linux/package.mk ]; then
-    . $HOME/.libreelec/packages/linux/package.mk
-  elif [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
+  . $ROOT/packages/linux/package.mk
   echo ${PKG_VERSION}
 }
 
@@ -95,26 +73,10 @@ get_module_dir() {
 # get package's build dir
 get_build_dir() {
   if [ ! -z $1 ] ; then
-    local _PKG_DIR=$(find $HOME/.libreelec/projects/$PROJECT/packages -name $1 2>/dev/null)
-    if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
+    local _PKG_DIR=$(find $ROOT/packages -name $1)
+    if [ -d $_PKG_DIR -a -f $_PKG_DIR/package.mk ] ; then
       . $_PKG_DIR/package.mk
-    else
-      local _PKG_DIR=$(find $HOME/.libreelec/packages -name $1 2>/dev/null)
-      if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
-        . $_PKG_DIR/package.mk
-      else
-        local _PKG_DIR=$(find $ROOT/projects/$PROJECT/packages -name $1 2>/dev/null)
-        if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
-          . $_PKG_DIR/package.mk
-        else
-          local _PKG_DIR=$(find $ROOT/packages -name $1 2>/dev/null)
-          if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
-            . $_PKG_DIR/package.mk
-          fi
-        fi
-      fi
     fi
-
     echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
   fi
 }
@@ -208,13 +170,14 @@ 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"`
-  fi
-  if [ -n "$LD_OPTIM_LTO" ] ; then
-    LDFLAGS=`echo $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() {
@@ -247,13 +210,11 @@ enable_service () {
   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
+  [ -z "$target" ] && target=`grep '^WantedBy' $target_dir/$unit_dir/$unit | cut -f2 -d=`
+
+  if [ -n "$target" ]; then
+    mkdir -p ${target_dir}/$unit_dir/${target}.wants
+    ln -sf ../${unit} ${target_dir}/$unit_dir/${target}.wants/
   fi
 }
 
@@ -273,28 +234,27 @@ dashes="==========================="
 
 check_config() {
 dashes="==========================="
-  if [ ! -d $PROJECT_DIR/$PROJECT -a ! -d $HOME/.libreelec/projects/$PROJECT ]; then
+  if [ ! -d $PROJECT_DIR/$PROJECT ]; then
     check_project="$check_project\n $dashes$dashes$dashes"
     check_project="$check_project\n ERROR: Project not found, use a valid project or create a new config"
     check_project="$check_project\n $dashes$dashes$dashes"
     check_project="$check_project\n\n Valid projects:"
 
-    for projects in $PROJECT_DIR/* $HOME/.libreelec/projects/*; do
+    for projects in $PROJECT_DIR/*; do
       check_project="$check_project\n - $(basename $projects)"
     done
     echo -e $check_project
     exit 1
   fi
 
-  if [ ! -f $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -a ! -f $HOME/.libreelec/projects/$PROJECT/linux/linux.$TARGET_ARCH.conf ] &&
-     ! ls $PROJECT_DIR/$PROJECT/linux/*/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 $PROJECT_DIR/$PROJECT/linux/*.conf $HOME/.libreelec/projects/$PROJECT/linux/*.conf $PROJECT_DIR/$PROJECT/linux/*/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
@@ -303,12 +263,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
@@ -333,23 +290,24 @@ 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"
 
   # Input device configuration
 
@@ -360,7 +318,7 @@ show_config() {
   config_message="$config_message\n - ATV Remote support:\t\t\t $ATVCLIENT_SUPPORT"
   config_message="$config_message\n - CEC Adapter support:\t\t\t $CEC_SUPPORT"
   config_message="$config_message\n - IRTrans support:\t\t\t $IRSERVER_SUPPORT"
-  config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT"
+  config_message="$config_message\n - XBMC Joystick support:\t\t $JOYSTICK_SUPPORT"
 
   # Misc. hardware configuration
 
@@ -369,7 +327,9 @@ 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
@@ -380,21 +340,22 @@ show_config() {
     config_message="$config_message\n - Include firmware:\t\t\t $config_firmware"
   done
 
-  for config_modules in $INITRAMFS_MODULES; do
-    config_message="$config_message\n - Initramfs modules:\t\t\t $config_modules"
-  done
-
   # Network service configuration
 
   config_message="$config_message\n\n Network service configuration:"
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - Avahi (Zeroconf) support:\t\t $AVAHI_DAEMON"
-  config_message="$config_message\n - NFS mounting support:\t\t $NFS_SUPPORT"
-  config_message="$config_message\n - SAMBA mounting support:\t\t $SAMBA_SUPPORT"
   config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER"
   config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER"
+  config_message="$config_message\n - PPTP support:\t\t\t $PPTP_SUPPORT"
   config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
+  config_message="$config_message\n - XBMC Airplay support:\t\t $AIRPLAY_SUPPORT"
+  config_message="$config_message\n - XBMC Airtunes support:\t\t $AIRTUNES_SUPPORT"
+  config_message="$config_message\n - XBMC AFP support:\t\t\t $AFP_SUPPORT"
+  config_message="$config_message\n - XBMC NFS support:\t\t\t $NFS_SUPPORT"
+  config_message="$config_message\n - XBMC SAMBA client support:\t\t $SAMBA_SUPPORT"
+  config_message="$config_message\n - XBMC Webserver support:\t\t $WEBSERVER"
 
   # OS configuration
 
@@ -404,10 +365,10 @@ show_config() {
   config_message="$config_message\n - OEM Support:\t\t\t\t $OEM_SUPPORT"
   config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD"
   config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER"
-  if [ "$BOOTLOADER" = "u-boot" ]; then
-    config_message="$config_message\n   - U-Boot configuration:\t\t $UBOOT_CONFIG"
-    config_message="$config_message\n   - U-Boot config file:\t\t $UBOOT_CONFIGFILE"
-  fi
+if [ "$BOOTLOADER" = "u-boot" ]; then
+  config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG"
+  config_message="$config_message\n - U-Boot config file:\t\t\t $UBOOT_CONFIGFILE"
+fi
   config_message="$config_message\n - UDevil support:\t\t\t $UDEVIL"
   config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
 
@@ -417,43 +378,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"
@@ -461,17 +410,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
-    $STRIP `find $* -type f -executable 2>/dev/null` 2>/dev/null || :
-  fi
-}
-
-# Use distribution functions if any
-if [ -f "distributions/$DISTRO/config/functions" ]; then
-  . distributions/$DISTRO/config/functions
-fi

config/graphic

@@ -1,3 +1,9 @@
+if [ "$DISPLAYSERVER" = "x11" ]; then
+  SDL_SUPPORT="yes"
+else
+  SDL_SUPPORT="no"
+fi
+
 if [ "$OPENGL" = no ]; then
   OPENGL_SUPPORT="no"
 else
@@ -10,34 +16,62 @@ 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"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do
+    if [ "$drv" = "dove" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS dove"
+    fi
+
     if [ "$drv" = "i915" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i915"
       XORG_DRIVERS="$XORG_DRIVERS intel"
       COMPOSITE_SUPPORT="yes"
-      VAAPI_SUPPORT="yes"
+      LIBVA="$LIBVA libva-intel-driver"
     fi
 
     if [ "$drv" = "i965" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i965"
       XORG_DRIVERS="$XORG_DRIVERS intel"
       COMPOSITE_SUPPORT="yes"
-      VAAPI_SUPPORT="yes"
+      LIBVA="$LIBVA libva-intel-driver"
+    fi
+
+    if [ "$drv" = "nouveau" ]; then
+      # DRI_DRIVERS are only used for NV04 - NV20 (which we dont want to support anymore)
+      DRI_DRIVERS="$DRI_DRIVERS"
+      # GALLIUM_DRIVERS are used for all cards from NV30 to nvc0
+      # see also http://nouveau.freedesktop.org/wiki/MesaDrivers/
+      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
+      XORG_DRIVERS="$XORG_DRIVERS nouveau"
+      COMPOSITE_SUPPORT="yes"
+#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nvidia" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia"
-      VDPAU_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nvidia-legacy" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
-      VDPAU_SUPPORT="yes"
+    fi
+
+    if [ "$drv" = "virtualbox" ]; then
+      DRI_DRIVERS="$DRI_DRIVERS,swrast"
+      XORG_DRIVERS="$XORG_DRIVERS virtualbox"
     fi
 
     if [ "$drv" = "r200" ]; then
@@ -51,7 +85,6 @@ get_graphicdrivers() {
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
       COMPOSITE_SUPPORT="yes"
-      VDPAU_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r600" ]; then
@@ -59,20 +92,13 @@ get_graphicdrivers() {
       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"
+      XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
       COMPOSITE_SUPPORT="yes"
-      VDPAU_SUPPORT="yes"
-    fi
-
-    if [ "$drv" = "virtualbox" ]; then
-      DRI_DRIVERS="$DRI_DRIVERS,swrast"
-      XORG_DRIVERS="$XORG_DRIVERS virtualbox"
     fi
 
     if [ "$drv" = "vmware" ]; then

config/noobs/os.json

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

config/noobs/partition_setup.sh

@@ -1,44 +1,46 @@
 #!/bin/sh -x
 ################################################################################
-#      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 LibreELEC Team
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2013 Stephan Raue (stephan@openelec.tv)
 #
-#  LibreELEC is free software: you can redistribute it and/or modify
+#  This Program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
 #
-#  LibreELEC is distributed in the hope that it will be useful,
+#  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
+#  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/>.
+#  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
 ################################################################################
 
-MOUNTPOINT="/tmp/LibreELEC-System"
+MOUNTPOINT="/tmp/OpenELEC-System"
 
 md5sumCheck() {
   ( cd $MOUNTPOINT
     echo "checking MD5: $1"
     md5sum -c $1.md5
     if [ "$?" = "1" ]; then
-      echo "#######################################################"
-      echo "#                                                     #"
-      echo "#     Invalid MD5 checksum - Installation stopped     #"
-      echo "#                                                     #"
-      echo "#         Your download was probably corrupt.         #"
-      echo "#    Visit https://libreelec.tv to download again     #"
-      echo "#                                                     #"
-      echo "#######################################################"
+      echo "######################################################"
+      echo "#                                                    #"
+      echo "# OpenELEC failed md5 check - Installation will quit #"
+      echo "#                                                    #"
+      echo "#    Your original download was probably corrupt.    #"
+      echo "#  Please visit www.openelec.tv and get another copy #"
+      echo "#                                                    #"
+      echo "######################################################"
       exit 1
     fi
     rm -rf $1.md5
   )
 }
 
-if [ -z $part1 -o -z $part2 -o -z $id1 -o -z $id2 ]; then
+if [ -z $part1 -o -z $part2 -o -z $id1 -o -z $id2]; then
   echo "error: part1, part2, id1 or id2 not specified"
   echo "actual values:"
   echo "part1:" $part1

config/noobs/partitions.json

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

config/optimize

@@ -24,13 +24,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_CXXFLAGS="$TARGET_CFLAGS"
-TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO"
+TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $LD_OPTIM_GOLD $LD_OPTIM_LTO $GCC_OPTIM"
 TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
 TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
 

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,46 +9,36 @@ 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 $ROOT/packages/linux/package.mk"
 
 # include versioning
   . config/version
 
-# read distro versioning if available
- if [ -f "$DISTRO_DIR/$DISTRO/version" ]; then
-   . $DISTRO_DIR/$DISTRO/version
- fi
-
-# read distro options if available
- if [ -f "$DISTRO_DIR/$DISTRO/options" ]; then
-   . $DISTRO_DIR/$DISTRO/options
- fi
-
 # read project options if available
  if [ -f "$PROJECT_DIR/$PROJECT/options" ]; then
    . $PROJECT_DIR/$PROJECT/options
  fi
 
+# Target system library C (eglibc)
+  TARGET_LIBC="eglibc"
+
+# Library strip
+  LIBSTRIP="yes"
+
 # Need to point to your actual cc
 # If you have ccache installed, take care that LOCAL_CC don't point to it
   LOCAL_CC=`which gcc`
 
-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++`
@@ -70,9 +52,7 @@ fi
 # 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
@@ -81,28 +61,21 @@ fi
 # the nearest multiple of 16 kilobytes.
   CCACHE_CACHE_SIZE="30G"
 
+# forcing install of all packages (yes/no)
+  FORCE_INSTALL="no"
+
 # install devtools on development builds
-  if [ "$LIBREELEC_VERSION" = "devel" ]; then
+  if [ "$OPENELEC_VERSION" = "devel" ]; then
     DEVTOOLS=yes
   fi
 
 # read options from $HOME if available
-  if [ -f "$HOME/.libreelec/options" ]; then
-    . $HOME/.libreelec/options
+  if [ -f "$HOME/.openelec/options" ]; then
+    . $HOME/.openelec/options
   fi
-  if [ -f "$HOME/.libreelec/projects/$PROJECT/options" ]; then
-    . $HOME/.libreelec/projects/$PROJECT/options
+  if [ -f "$HOME/.openelec/$PROJECT/options" ]; then
+    . $HOME/.openelec/$PROJECT/options
   fi
 
-# read distro options from $HOME if available
-  if [ -f "$HOME/.libreelec/options.$DISTRO" ]; then
-    . $HOME/.libreelec/options.$DISTRO
-  fi
-
-# overwrite OEM_SUPPORT via commandline
-if [ "$OEM" = yes -o "$OEM" = no ]; then
-  OEM_SUPPORT=$OEM
-fi
-
 . config/graphic
 . config/path $1

config/path

@@ -17,17 +17,9 @@ set -e
   fi
 
 HOST_NAME=`$LOCAL_CC -dumpmachine`
-TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI}
-
-BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION
-if [ "$LIBREELEC_VERSION" = "devel" ] ; then
-  BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
-fi
-
-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"
@@ -40,7 +32,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
+FAKEROOT_SCRIPT=$ROOT/.fakeroot.$PROJECT.$TARGET_ARCH
 
 if [ -z "$INSTALL" ]; then
   INSTALL=$BUILD/image/system
@@ -61,8 +53,6 @@ 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=""
@@ -74,80 +64,26 @@ SED="sed -i"
   PKG_IS_ADDON="no"
 
   if [ -n "$1" ]; then
-    _PKG_ROOT_NAME=$(echo $1 | cut -d: -f1)
-    _ALL_DIRS=""
-    _FOUND=0
-    PKG_DIR=""
-
-    # check project folder for a package in home dir
-    for DIR in $(find $HOME/.libreelec/projects/$PROJECT/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do
-      if [ -r "$DIR/package.mk" ]; then
-        # found first, set $PKG_DIR
+    FOUND=0
+    for DIR in $ROOT/`find $PACKAGES -type d -name $(echo $1| awk -F : '{print $1}') ! -wholename \*\/source\/\* 2>/dev/null` ; do
+      # keep track of dirs with meta for debugging
+      if [ -z "$ALL_DIRS" ] ; then
+        ALL_DIRS="$DIR"
+      else
+        ALL_DIRS="$ALL_DIRS\\n$DIR"
+      fi
+      if [ -f "$DIR/package.mk" ] ; then
+        FOUND=$((FOUND+1))
+        # found first. set $PKG_DIR
         PKG_DIR="$DIR"
-        # keep track of dirs with package.mk for detecting multiple folders
-        _ALL_DIRS="${_ALL_DIRS}${DIR}\\n"
-        _FOUND=$((_FOUND+1))
-        if [ $_FOUND -gt 1 ]; then
-          # _FOUND more ? fail
+        if [ $FOUND -gt 1 ] ; then
+          # found more ? fail
           echo "Error - multiple package folders:"
-          echo -e "$_ALL_DIRS"
+          echo -e "$ALL_DIRS"
           exit 1
         fi
       fi
     done
-
-    # check for a package in home dir if not found already
-    for DIR in $(find $HOME/.libreelec/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do
-      if [ -r "$DIR/package.mk" ]; then
-        # found first, set $PKG_DIR
-        PKG_DIR="$DIR"
-        # keep track of dirs with package.mk for detecting multiple folders
-        _ALL_DIRS="${_ALL_DIRS}${DIR}\\n"
-        _FOUND=$((_FOUND+1))
-        if [ $_FOUND -gt 1 ]; then
-          # _FOUND more ? fail
-          echo "Error - multiple package folders:"
-          echo -e "$_ALL_DIRS"
-          exit 1
-        fi
-      fi
-    done
-
-    # check project folder for a package if not found already
-    for DIR in $(find $ROOT/projects/$PROJECT/packages -type d -name $_PKG_ROOT_NAME 2>/dev/null); do
-      if [ -r "$DIR/package.mk" ]; then
-        # found first, set $PKG_DIR
-        PKG_DIR="$DIR"
-        # keep track of dirs with package.mk for detecting multiple folders
-        _ALL_DIRS="${_ALL_DIRS}${DIR}\\n"
-        _FOUND=$((_FOUND+1))
-        if [ $_FOUND -gt 1 ]; then
-          # _FOUND more ? fail
-          echo "Error - multiple package folders:"
-          echo -e "$_ALL_DIRS"
-          exit 1
-        fi
-      fi
-    done
-
-    # then check packages folder if not found already
-    if [ $_FOUND -eq 0 ]; then
-      for DIR in $(find $ROOT/$PACKAGES -type d -name $_PKG_ROOT_NAME 2>/dev/null); do
-        if [ -r "$DIR/package.mk" ]; then
-          # found first, set $PKG_DIR
-          PKG_DIR="$DIR"
-          # keep track of dirs with package.mk for detecting multiple folders
-          _ALL_DIRS="${_ALL_DIRS}${DIR}\\n"
-          _FOUND=$((_FOUND+1))
-          if [ $_FOUND -gt 1 ]; then
-            # found more ? fail
-            echo "Error - multiple package folders:"
-            echo -e "$_ALL_DIRS"
-            exit 1
-          fi
-        fi
-      done
-    fi
   fi
 
   if [ -r $PKG_DIR/package.mk ]; then
@@ -158,38 +94,6 @@ SED="sed -i"
     [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
   fi
 
-  # Automatically set PKG_SOURCE_NAME unless it is already defined.
-  # PKG_SOURCE_NAME will be automatically set to a name based on
-  # the $PKG_NAME-$PKG_VERSION convention.
-  #
-  # Any $PKG_URL that references more than a single url will abort
-  # the build as these are no longer supported - use mkpkg instead.
-  if [ -n "$PKG_URL" -a -z "$PKG_SOURCE_NAME" ]; then
-    if [[ $PKG_URL =~ .*\ .* ]]; then
-      echo "Error - packages with multiple urls are no longer supported, use mkpkg:"
-      echo "$PKG_URL"
-      exit 1
-    fi
-    PKG_SOURCE_NAME="$(basename "$PKG_URL")"
-    case $PKG_SOURCE_NAME in
-      ${PKG_NAME}-${PKG_VERSION}.*)
-        PKG_SOURCE_NAME=$PKG_SOURCE_NAME
-        ;;
-      *.tar | *.tbz | *.tgz | *.txz | *.7z | *.zip)
-        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.${PKG_SOURCE_NAME##*\.}
-        ;;
-      *.tar.bz2 | *.tar.gz | *.tar.xz)
-        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.tar.${PKG_SOURCE_NAME##*\.}
-        ;;
-       *.diff | *.patch | *.diff.bz2 | *.patch.bz2 | patch-*.bz2 | *.diff.gz | *.patch.gz | patch-*.gz)
-        PKG_SOURCE_NAME=$PKG_SOURCE_NAME
-        ;;
-      *)
-        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.${PKG_SOURCE_NAME##*\.}
-        ;;
-    esac
-  fi
-
   PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
 
 XORG_PATH_DRI=/usr/lib/dri
@@ -199,11 +103,11 @@ 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++
 
-unset TARGET_CPP
-
 TARGET_CC=${TARGET_PREFIX}gcc
 TARGET_CXX=${TARGET_PREFIX}g++
 TARGET_LD=${TARGET_PREFIX}ld
@@ -221,8 +125,6 @@ TARGET_PKG_CONFIG_PATH=""
 TARGET_PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
 TARGET_PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
 
-unset HOST_CPP
-
 HOST_AWK=gawk
 HOST_CC=$ROOT/$TOOLCHAIN/bin/host-gcc
 HOST_CXX=$ROOT/$TOOLCHAIN/bin/host-g++
@@ -239,7 +141,7 @@ HOST_PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pk
 HOST_PKG_CONFIG_SYSROOT_DIR=""
 
 if [ -z "$CCACHE_DIR" ]; then
-    export CCACHE_DIR=$HOME/.ccache-libreelec
+    export CCACHE_DIR=$HOME/.ccache-openelec
 fi
 export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL
 export PKG_CONFIG=$ROOT/$TOOLCHAIN/bin/pkg-config

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="devel"
+  OPENELEC_VERSION="4.0.6"
 
 # OS_VERSION: OS Version
-  OS_VERSION="7.0"
+  OS_VERSION="4.0"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="7.0"
+  ADDON_VERSION="4.1"
 

distributions/LibreELEC/options

@@ -1,208 +0,0 @@
-# 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 media centre 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 (Confluence)
-# Space separated list is supported,
-# e.g. SKINS="Confluence"
-  SKINS="Confluence"
-
-# Default Skin (Confluence)
-  SKIN_DEFAULT="Confluence"
-
-# install extra subtitle Fonts for KODI (yes / no)
-  KODI_EXTRA_FONTS="yes"
-
-# build and install 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 dvbhdhomerun"
-
-# build and install bluetooth support (yes / no)
-  BLUETOOTH_SUPPORT="yes"
-
-# build and install with KODI webfrontend (yes / no)
-  KODI_WEBSERVER_SUPPORT="yes"
-
-# build and install Avahi (Zeroconf) daemon (yes / no)
-  AVAHI_DAEMON="yes"
-
-# build with UPnP support (yes / no)
-  KODI_UPNP_SUPPORT="yes"
-
-# build with MySQL support (yes / no)
-  KODI_MYSQL_SUPPORT="yes"
-
-# build xbmc with sshlib support (yes / no)
-  KODI_SSHLIB_SUPPORT="yes"
-
-# build xbmc with optical drive support (yes / no)
-  KODI_OPTICAL_SUPPORT="yes"
-
-# 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 (ratpoison / 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 IRServer IR/LCD support (yes / no)
-  IRSERVER_SUPPORT="yes"
-
-# build and install Joystick support (yes / no)
-  JOYSTICK_SUPPORT="yes"
-
-# build and install CEC adapter support (yes / no)
-  CEC_SUPPORT="yes"
-
-# build and install iSCSI support - iscsistart (yes / no)
-  ISCSI_SUPPORT="yes"
-
-# LCD driver to Use - Possible drivers are ( Comma seperated:
-# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,dm140,
-# ea65,EyeboxOne,g15,glcd,glcdlib,glk,hd44780,i2500vfd,
-# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,
-# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,
-# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,
-# picolcd,pyramid,sed1330,sed1520,serialPOS,
-# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,vlsys_m428
-# 'all' compiles all drivers;
-# 'all,!xxx,!yyy' de-selects previously selected drivers
-# "none" for disable LCD support
-  LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428,serialVFD,shuttleVFD"
-
-# Support for partitioning and formating disks in initramfs (yes / no)
-# This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
-  INITRAMFS_PARTED_SUPPORT="no"
-
-# build with swap support (yes / no)
-  SWAP_SUPPORT="no"
-
-# swap support enabled per default (yes / no)
-  SWAP_ENABLED_DEFAULT="no"
-
-# swapfile size if SWAP_SUPPORT=yes in MB
-  SWAPFILESIZE="256"
-
-# build with installer (yes / no)
-  INSTALLER_SUPPORT="yes"
-
-# Testpackages for development (yes / no)
-  TESTING="no"
-
-# OEM packages for OEM's (yes / no)
-  OEM_SUPPORT="no"
-
-# build and install nano text editor (yes / no)
-  NANO_EDITOR="yes"
-
-# cron support (yes / no)
-  CRON_SUPPORT="yes"
-
-# 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/lib/cxxtools/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
 #
 #  OpenELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="cxxtools"
-PKG_VERSION="2.2.1"
+PKG_VERSION="2.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"
@@ -48,7 +48,6 @@ post_makeinstall_host() {
 }
 
 post_makeinstall_target() {
-  $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/cxxtools-config
-
+  rm -rf $SYSROOT_PREFIX/usr/bin/cxxtools-config
   rm -rf $INSTALL/usr/bin
 }

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

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

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

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
 #
 #  OpenELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

packages/3rdparty/multimedia/vdr-control/package.mk

@@ -0,0 +1,55 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="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_SOURCE_DIR="control-${PKG_VERSION}"
+PKG_DEPENDS_TARGET="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"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
+post_make_target() {
+  $STRIP libvdr-*.so*
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
 #
 #  OpenELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,13 +16,13 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="vdr-plugin-dummydevice"
+PKG_NAME="vdr-dummydevice"
 PKG_VERSION="2.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.vdr-wiki.de/wiki/index.php/Dummydevice-plugin"
-PKG_URL="http://phivdr.dyndns.org/vdr/vdr-dummydevice/${PKG_NAME/-plugin/}-$PKG_VERSION.tgz"
+PKG_URL="http://phivdr.dyndns.org/vdr/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tgz"
 PKG_SOURCE_DIR="dummydevice-${PKG_VERSION}"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
@@ -33,23 +33,20 @@ PKG_LONGDESC="vdr dummydevice plugin"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
 make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
-
-  make \
+  make VDRDIR=$VDR_DIR \
     LIBDIR="." \
-    LOCDIR="./locale" \
-    all install-i18n
+    LOCALEDIR="./locale"
 }
 
 post_make_target() {
-  VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
-  LIB_NAME=lib${PKG_NAME/-plugin/}
-
-  cp --remove-destination ${LIB_NAME}.so ${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 

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

@@ -0,0 +1,46 @@
+diff --git a/Makefile b/Makefile
+index dc959f1..5cb2315 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,22 +15,15 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
+ 
+ ### 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
+ 
+ ### 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:
+ 
+@@ -47,7 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES +=
++INCLUDES += -I$(VDRDIR)/include
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+@@ -103,6 +96,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

packages/3rdparty/multimedia/vdr-epgsearch/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
 #
 #  OpenELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,13 +16,13 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="vdr-plugin-epgsearch"
-PKG_VERSION="0b09f90"
+PKG_NAME="vdr-epgsearch"
+PKG_VERSION="29c174a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://winni.vdr-developer.org/epgsearch/"
-PKG_URL="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
@@ -33,24 +33,17 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-make_target() {
-  VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
-
-  make \
-    LIBDIR="." \
-    LOCDIR="./locale" \
-    all install-i18n
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+  export CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+  export LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 }
 
-post_make_target() {
+make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
-  LIB_NAME=lib${PKG_NAME/-plugin/}
-
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
-  $STRIP libvdr-*.so*
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
 }
 
 makeinstall_target() {

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-epgsearch/patches/vdr-epgsearch-02_vdr-2.1.2-buildfix.patch

@@ -0,0 +1,19 @@
+commit e8bb2e8e0ef3602fc8cb252cee541bed5d45fc5c
+Author: Stefan Saraev <stefan@saraev.ca>
+Date:   Sat Oct 19 22:19:10 2013 +0300
+
+    vdr 2.1.2 buildfix
+
+diff --git a/uservars.h b/uservars.h
+index f098750..a0e047c 100644
+--- a/uservars.h
++++ b/uservars.h
+@@ -538,7 +538,7 @@ class cVideodirVar : public cInternalVar {
+     cVideodirVar() : cInternalVar("videodir") {}
+     string Evaluate(const cEvent*, bool escapeStrings = false)
+ 	{
+-	    return VideoDirectory;
++	    return cVideoDirectory::Name();
+ 	}
+ };
+ 

packages/3rdparty/multimedia/vdr-iptv/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
 #
 #  OpenELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,13 +16,13 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="vdr-plugin-iptv"
-PKG_VERSION="2.2.1"
+PKG_NAME="vdr-iptv"
+PKG_VERSION="2.1.2"
 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/-plugin/}-$PKG_VERSION.tgz"
+PKG_URL="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/$PKG_NAME-$PKG_VERSION.tgz"
 PKG_SOURCE_DIR="iptv-${PKG_VERSION}"
 PKG_DEPENDS_TARGET="toolchain vdr curl"
 PKG_PRIORITY="optional"
@@ -33,24 +33,17 @@ PKG_LONGDESC="vdr-iptv is an IPTV plugin for the Video Disk Recorder (VDR)"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-make_target() {
-  VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
-
-  make \
-    LIBDIR="." \
-    LOCDIR="./locale" \
-    all install-i18n
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
 }
 
-post_make_target() {
+make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
-  LIB_NAME=lib${PKG_NAME/-plugin/}
-
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
-  $STRIP libvdr-*.so*
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
 }
 
 makeinstall_target() {

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

@@ -0,0 +1,57 @@
+diff --git a/Makefile b/Makefile
+index 48c8b2c..d370f92 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,24 +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_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+-LIBDIR = $(call PKGCFG,libdir)
+-LOCDIR = $(call PKGCFG,locdir)
+-PLGCFG = $(call PKGCFG,plgcfg)
+-RESDIR = $(call PKGCFG,resdir)
+-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:
+ 
+@@ -65,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)"'
+ 
+@@ -139,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-live/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
 #
 #  OpenELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,13 +16,13 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="vdr-plugin-live"
+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/-plugin/}-${PKG_VERSION}.tar.gz"
+PKG_URL="http://live.vdr-developer.org/downloads/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_SOURCE_DIR="live-${PKG_VERSION}"
 PKG_DEPENDS_TARGET="toolchain vdr tntnet pcre:host pcre"
 PKG_PRIORITY="optional"
@@ -34,9 +34,9 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 pre_configure_target() {
-  export CFLAGS="$CFLAGS -fPIC"
-  export CXXFLAGS="$CXXFLAGS -fPIC"
-  export LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib/iconv"
+  export CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+  export CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+  export LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 }
 
 pre_make_target() {

packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk

@@ -0,0 +1,59 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="vdr-plugin-dvbapi"
+PKG_VERSION="bf11f9e"
+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_TARGET="toolchain vdr openssl libdvbcsa"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="TV"
+PKG_LONGDESC="TV"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+  export CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
+}
+
+pre_make_target() {
+  # dont build parallel
+  MAKEFLAGS=-j1
+}
+
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    VDRSRC=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale" \
+    LIBDVBCSA=1
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

@@ -0,0 +1,54 @@
+diff --git a/Makefile b/Makefile
+index efd124a..ed303fa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,22 +12,14 @@ PLUGIN = dvbapi
+ ### The version number of this plugin (taken from the main source file):
+ 
+ VERSION = $(shell grep 'static const char \*VERSION *=' DVBAPI.h | awk '{ print $$6 }' | sed -e 's/[";]//g')
+-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_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+-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:
+ 
+@@ -35,7 +27,7 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
+ 
+ ### 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:
+ 
+@@ -48,7 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES +=
++INCLUDES += -I$(VDRDIR)/include
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+@@ -122,6 +114,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS) $(FFDECSA)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(DECSALIB) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ ifndef LIBDVBCSA
+ $(FFDECSA): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h

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

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
 #
 #  OpenELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-eepg"
-PKG_VERSION="9cd9a75"
+PKG_VERSION="69b47ba"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-eepg"
-PKG_URL="http://projects.vdr-developer.org/git/vdr-plugin-eepg.git/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
@@ -33,24 +33,17 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-make_target() {
-  VDR_DIR=$(get_build_dir vdr)
-  export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
-  export CPLUS_INCLUDE_PATH=$VDR_DIR/include
-
-  make \
-    LIBDIR="." \
-    LOCDIR="./locale" \
-    all install-i18n
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
 }
 
-post_make_target() {
+make_target() {
   VDR_DIR=$(get_build_dir vdr)
-  VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
-  LIB_NAME=lib${PKG_NAME/-plugin/}
-
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
-  $STRIP libvdr-*.so*
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
 }
 
 makeinstall_target() {

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

@@ -0,0 +1,34 @@
+--- vdr-plugin-eepg-master/Makefile	2014-03-11 15:44:36.675368020 +0000
++++ vdr-plugin-eepg-master/Makefile	2014-03-11 15:51:02.065495474 +0000
+@@ -31,21 +31,16 @@
+ ### 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_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+-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
+ 
+ ### 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:
+ 
+@@ -119,6 +114,7 @@
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

packages/3rdparty/multimedia/vdr-plugin-streamdev/package.mk

@@ -0,0 +1,52 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="vdr-plugin-streamdev"
+PKG_VERSION="40704cd"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://projects.vdr-developer.org/projects/show/plg-streamdev"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain vdr openssl"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="TV"
+PKG_LONGDESC="TV"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}
+

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

@@ -0,0 +1,53 @@
+diff --git a/Makefile b/Makefile
+index 90f3261..d80e15d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,22 +15,15 @@ VERSION = $(shell grep 'const char \*VERSION *=' common.c | awk '{ print $$5 }'
+ 
+ ### 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
+ 
+ ### 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:
+ 
+diff --git a/client/Makefile b/client/Makefile
+index ea9dc45..6fac485 100644
+--- a/client/Makefile
++++ b/client/Makefile
+@@ -72,6 +72,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(CLIENTOBJS) $(COMMONOBJS) ../tools/sockettools.a
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+diff --git a/server/Makefile b/server/Makefile
+index 37cd4bb..8d2f49f 100644
+--- a/server/Makefile
++++ b/server/Makefile
+@@ -78,6 +78,7 @@ install-i18n: $(I18Nmsgs)
+ $(SOFILE): $(SERVEROBJS) $(COMMONOBJS) \
+ 	../tools/sockettools.a ../remux/remux.a ../libdvbmpeg/libdvbmpegtools.a
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

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

@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index d80e15d..ed2e168 100644
+--- a/Makefile
++++ b/Makefile
+@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE)
+ INCLUDES += -I$(VDRDIR)/include -I..
+ export INCLUDES
+ 
+-DEFINES += -D_GNU_SOURCE
++DEFINES += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ 
+ ifdef DEBUG
+ DEFINES += -DDEBUG

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/package.mk

@@ -0,0 +1,51 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="vdr-plugin-vnsiserver"
+PKG_VERSION="a3f7ac5"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/opdenkamp/xbmc-pvr-addons/tree/master/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="TV"
+PKG_LONGDESC="TV"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

@@ -0,0 +1,92 @@
+diff --git a/Makefile b/Makefile
+index 8f37c92..94869aa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,30 +16,18 @@ VERSION = $(shell grep 'static const char \*VERSION *=' vnsi.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
+ 
+ ### 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
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ # backwards compatibility version < 1.7.34
+-API1733 := $(shell if [ "$(APIVERSION)" \< "1.7.34" ]; then echo true; fi; )
+-
+-ifdef API1733
+ 
+ VDRSRC = $(VDRDIR)
+ VDRSRC ?= ../../..
+@@ -47,21 +35,8 @@ ifeq ($(strip $(LIBDIR)),)
+ LIBDIR = $(VDRSRC)/PLUGINS/lib
+ endif
+ 
+-ifndef NOCONFIG
+-CXXFLAGS = $(call PKGCFG,cflags)
+-CXXFLAGS += -fPIC
+-else
+ -include $(VDRSRC)/Make.global
+ -include $(VDRSRC)/Make.config
+-endif
+-
+-export CXXFLAGS
+-else
+-
+-### Allow user defined options to overwrite defaults:
+-
+--include $(PLGCFG)
+-endif
+ 
+ ### The name of the distribution archive:
+ 
+@@ -74,11 +49,9 @@ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-ifdef API1733
+ INCLUDES += -I$(VDRSRC)/include
+-endif
+ 
+-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVNSI_SERVER_VERSION='"$(VERSION)"'
++DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVNSI_SERVER_VERSION='"$(VERSION)"' -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ 
+ ifeq ($(DEBUG),1)
+ DEFINES += -DDEBUG
+@@ -94,11 +67,7 @@ OBJS = vnsi.o bitstream.o vnsiclient.o config.o cxsocket.o parser.o parser_AAC.o
+ 
+ ### The main target:
+ 
+-ifdef API1733
+-all: install-lib
+-else
+ all: $(SOFILE)
+-endif
+ #
+ 
+ ### Implicit rules:
+@@ -145,6 +114,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
 #
 #  OpenELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-xmltv2vdr"
-PKG_VERSION="b48e0bec"
+PKG_VERSION="30903cc0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -37,7 +37,6 @@ pre_configure_target() {
   export CFLAGS="$CFLAGS -fPIC"
   export CXXFLAGS="$CXXFLAGS -fPIC"
   export LDFLAGS="$LDFLAGS -fPIC"
-  export LIBS="-L$SYSROOT_PREFIX/usr/lib/iconv"
 }
 
 make_target() {

packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/patches/vdr-plugin-xmltv2vdr-01_vdr-2.1.2-buildfix.patch

@@ -0,0 +1,19 @@
+commit 6d5c30323f49c7960c873a423ec948834bbe8737
+Author: Stefan Saraev <stefan@saraev.ca>
+Date:   Sat Oct 19 22:24:10 2013 +0300
+
+    vdr 2.1.2 buildfix
+
+diff --git a/xmltv2vdr.cpp b/xmltv2vdr.cpp
+index b367508..7b61c61 100644
+--- a/xmltv2vdr.cpp
++++ b/xmltv2vdr.cpp
+@@ -274,7 +274,7 @@ cGlobals::cGlobals()
+     imgdelafter=30;
+     soundex=false;
+ 
+-    if (asprintf(&epgfile_store,"%s/epg.db",VideoDirectory)==-1) {};
++    if (asprintf(&epgfile_store,"%s/epg.db",cVideoDirectory::Name())==-1) {};
+ 
+     if (!CheckEPGDir("/var/run/vdr"))
+     {

packages/3rdparty/multimedia/vdr-plugin-xvdr/config/allowed_hosts.conf

@@ -0,0 +1,13 @@
+#
+# allowed_hosts.conf  This file describes a number of host addresses that
+#                     are allowed to connect to the streamdev server running 
+#                     with the Video Disk Recorder (VDR) on this system.
+# Syntax:
+#
+# IP-Address[/Netmask]
+#
+
+127.0.0.1             # always accept localhost
+192.168.0.0/24        # any host on the local net
+#204.152.189.113      # a specific host
+#0.0.0.0/0            # any host on any net (USE THIS WITH CARE!)

packages/3rdparty/multimedia/vdr-plugin-xvdr/package.mk

@@ -0,0 +1,51 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="vdr-plugin-xvdr"
+PKG_VERSION="7f49bfa"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/pipelka/vdr-plugin-xvdr"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain vdr"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="TV"
+PKG_LONGDESC="TV"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

@@ -0,0 +1,59 @@
+From 08b08a02a8e93e9b11594e2e846ec2b1a316d314 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Wed, 12 Feb 2014 20:32:03 +0200
+Subject: [PATCH] makefile
+
+---
+ Makefile |   15 ++++-----------
+ 1 files changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index da54323..81ba0e7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,23 +15,15 @@ VERSION = $(shell grep 'static const char \*VERSION *=' src/xvdr/xvdr.h | awk '{
+ 
+ ### 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)/plugins/$(PLUGIN)
+-#
+ 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:
+ 
+@@ -48,7 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES += -I./src -I./src/vdr
++INCLUDES += -I./src -I./src/vdr -I$(VDRDIR)/include
+ 
+ ifdef DEBUG
+ INCLUDES += -DDEBUG
+@@ -136,6 +128,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+-- 
+1.7.2.5
+

packages/3rdparty/multimedia/vdr-satip/package.mk

@@ -0,0 +1,52 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="vdr-satip"
+PKG_VERSION="0.2.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
+PKG_URL="http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_SOURCE_DIR="satip-${PKG_VERSION}"
+PKG_DEPENDS_TARGET="toolchain vdr curl tinyxml"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr-satip: SAT>IP plugin for VDR"
+PKG_LONGDESC="vdr-satip is a SAT>IP plugin for VDR"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CXXFLAGS="$CXXFLAGS -fPIC"
+  export LDFLAGS="$LDFLAGS -fPIC"
+}
+
+make_target() {
+  VDR_DIR=$(get_build_dir vdr)
+  make VDRDIR=$VDR_DIR \
+    SATIP_USE_TINYXML=1 \
+    LIBDIR="." \
+    LOCALEDIR="./locale"
+}
+
+makeinstall_target() {
+  : # installation not needed, done by create-addon script
+}

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

@@ -0,0 +1,56 @@
+diff --git a/Makefile b/Makefile
+index 524338c..0569ebe 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_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+-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)"'
+ 
+@@ -139,6 +129,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ ifndef SATIP_DEBUG
+ 	@$(STRIP) $@
+ endif

packages/3rdparty/multimedia/vdr-wirbelscan/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
 #
 #  OpenELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,13 +16,13 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="vdr-plugin-wirbelscan"
-PKG_VERSION="0.0.9"
+PKG_NAME="vdr-wirbelscan"
+PKG_VERSION="0.0.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/wirbelscan/index2.html"
-PKG_URL="http://wirbel.htpc-forum.de/wirbelscan/${PKG_NAME/-plugin/}-$PKG_VERSION.tgz"
+PKG_URL="http://wirbel.htpc-forum.de/wirbelscan/$PKG_NAME-$PKG_VERSION.tgz"
 PKG_SOURCE_DIR="wirbelscan-${PKG_VERSION}"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"