Merge remote-tracking branch 'upstream/master' into framebuffer-rework

services that depend on Xorg (such as ratpoison/xbmc)
should wait with starting until Xorg is ready for X11 connections

xorg-launch-helper is a simple solution. it starts and forks the
Xorg server and listens for a signal from Xorg. At this point, the
utility signals systemd READY through sd_notify(). At this point
systemd will start units that have an explicit ordering configured
to be after the xorg.service

...
Oct 10 12:03:36 openelec systemd[1]: Reached target Multi-User System.
Oct 10 12:03:36 openelec systemd[1]: Starting Xorg Server...
Oct 10 12:03:39 openelec systemd[1]: Started Xorg Server.
Oct 10 12:03:39 openelec systemd[1]: Starting Ratpoison Window Manager...
Oct 10 12:03:39 openelec systemd[1]: Started Ratpoison Window Manager.
Oct 10 12:03:39 openelec systemd[1]: Starting Graphical Interface.
Oct 10 12:03:39 openelec systemd[1]: Reached target Graphical Interface.
Oct 10 12:03:39 openelec systemd[1]: Starting XBMC user autostart script...
Oct 10 12:03:39 openelec systemd[1]: Started XBMC user autostart script.
Oct 10 12:03:39 openelec systemd[1]: Starting XBMC Media Center...
Oct 10 12:03:39 openelec systemd[1]: Started XBMC Media Center.
Oct 10 12:03:39 openelec systemd[1]: Starting XBMC Mediacenter Interface.
Oct 10 12:03:39 openelec systemd[1]: Reached target XBMC Mediacenter Interface.
Oct 10 12:03:39 openelec systemd[1]: Startup finished in 2.556s (kernel) + 5.194s (userspace) = 7.750s.
...

CONTRIBUTING.md

@@ -1,14 +1,18 @@
-## Questions about OpenELEC?
+### Questions about OpenELEC?
 
-To get your questions answered, please ask in the OpenELEC [Forum] or on IRC: #openelec 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
+### Issue Reports
 
-If you are at all unsure whether it's a bug in OpenELEC or a problem with something
-else, post in the OpenELEC [Forum] instead. If it turns out that it is a bug, an issue
-can always bee opend later.
+**BEFORE you report a bug make sure you got the latest testing version of 
+OpenELEC. Your bug might be already fixed.**
+
+If you are at all unsure whether it's a bug in OpenELEC or a problem with 
+something else, post in the OpenELEC [Forum] instead. If it turns out that it is
+a bug, an issue can always be opened later.
 
 If you are sure that it's a bug in OpenELEC and you have not found a [similar issue], open a new [issue]
 and try to answer the following questions:
@@ -16,21 +20,22 @@ and try to answer the following questions:
 - What did you expect to happen?
 - What happened instead?
 
-It is also importent to provide logs for debugging.
-A zip file can be found in the [logfiles] samba share, this will contain all the logs needed.
+**It is also importent to provide logs for debugging.
+A zip file can be found in the [logfiles] samba share, this will contain all the logs needed.**
 
 Make sure to specify which version of OpenELEC you are using.
 - OpenELEC version
 - OpenELEC build
 - OpenELEC arch
 
-Please don't paste log messages in the issue reports or issue comments use [sprunge.us](http://sprunge.us) instead
+Please don't paste log messages in the issue reports or issue comments - use 
+[sprunge.us](http://sprunge.us) instead.
 
 Feature requests are great, but they usually end up lying around the issue
 tracker indefinitely. Sending a pull request is a much better way of getting a
 particular feature into OpenELEC.
 
-## Pull Requests
+### Pull Requests
 
 - **Create topic branches**. Don't ask us to pull from your master branch.
 

Makefile

@@ -8,6 +8,12 @@ system:
 release:
 	./scripts/image release
 
+image:
+	BUILD_IMAGE=yes ./scripts/image release
+
+noobs:
+	./scripts/image noobs
+
 clean:
 	rm -rf $(BUILD_DIRS)/* $(BUILD_DIRS)/.stamps
 

TODO

@@ -1,2 +1,21 @@
 ncurses-5.8/5.9:
   - segfaults in nano and dialog -> using ncurses-5.7
+
+intel-gpu-tools:
+  - remove this package after gotham.
+    not needed anymore as xbmc has "use limited
+    color space" option
+
+timezone-data:
+  - fix tzdata-setup for gotham. now there is no 
+    <timezone> in guisettings.xml or ping Montellese
+
+systemd:
+  - fix graphical.target/xorg deps mess
+
+irserver:
+  - rework irserver/init.d for systemd
+
+RTL8192CU:
+  - add CONFIG_RTL8192CU to all kernel configs
+    and test removing this package 

config/functions

@@ -191,6 +191,22 @@ fix_module_depends() {
   rm new.modinfo*
 }
 
+# Usage: enable_service <unit> [target]
+enable_service () {
+  local unit="$1"
+  local unit_dir="/lib/systemd/system"
+  local target="$2"
+  local target_dir=$INSTALL
+
+  [ -f "$target_dir/$unit_dir/$unit" ] || exit 1
+  [ -z "$target" ] && target=`grep '^WantedBy' $target_dir/$unit_dir/$unit | cut -f2 -d=`
+
+  if [ -n "$target" ]; then
+    mkdir -p ${target_dir}/$unit_dir/${target}.wants
+    ln -sf ../${unit} ${target_dir}/$unit_dir/${target}.wants/
+  fi
+}
+
 check_path() {
 dashes="==========================="
   if [ "${PWD##/usr}" != "${PWD}" ]; then
@@ -281,7 +297,6 @@ show_config() {
   config_message="$config_message\n - XBMC Player driver:\t\t\t $XBMCPLAYER_DRIVER"
   config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI"
   config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU"
-  config_message="$config_message\n - XVBA Support:\t\t\t $XVBA"
 
   # Input device configuration
 
@@ -344,8 +359,8 @@ if [ "$BOOTLOADER" = "u-boot" ]; then
   config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG"
   config_message="$config_message\n - U-Boot config file:\t\t\t $UBOOT_CONFIGFILE"
 fi
-  config_message="$config_message\n - UDisks support:\t\t\t $UDISKS"
-  config_message="$config_message\n - UPower support:\t\t\t $UPOWER"
+  config_message="$config_message\n - UDevil support:\t\t\t $UDEVIL"
+  config_message="$config_message\n - Parted support:\t\t\t $PARTED"
   config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
 
   # Misc. Filesystems

config/graphic

@@ -28,7 +28,7 @@ fi
 
 get_graphicdrivers() {
   if [ "$GRAPHIC_DRIVERS" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx fglrx-legacy nvidia vmware virtualbox"
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware virtualbox"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do
@@ -36,28 +36,18 @@ get_graphicdrivers() {
       XORG_DRIVERS="$XORG_DRIVERS dove"
     fi
 
-    if [ "$drv" = "fglrx" ]; then
-      XORG_DRIVERS="$XORG_DRIVERS fglrx"
-      COMPOSITE_SUPPORT="yes"
-      XINERAMA_SUPPORT="yes"
-    fi
-
-    if [ "$drv" = "fglrx-legacy" ]; then
-      XORG_DRIVERS="$XORG_DRIVERS fglrx-legacy"
-      COMPOSITE_SUPPORT="yes"
-      XINERAMA_SUPPORT="yes"
-    fi
-
     if [ "$drv" = "i915" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i915"
 #      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
       XORG_DRIVERS="$XORG_DRIVERS intel"
+      COMPOSITE_SUPPORT="yes"
 #      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "i965" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i965"
       XORG_DRIVERS="$XORG_DRIVERS intel"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nouveau" ]; then
@@ -93,18 +83,21 @@ get_graphicdrivers() {
     if [ "$drv" = "r200" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,r200"
       XORG_DRIVERS="$XORG_DRIVERS ati"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r300" ]; then
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r600" ]; then
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
+      COMPOSITE_SUPPORT="yes"
     fi
 
     if [ "$drv" = "vmware" ]; then

config/noobs/os.json

@@ -0,0 +1,7 @@
+{
+  "name": "@DISTRONAME@",
+  "version": "@OPENELEC_VERSION@",
+  "release_date": "@RELEASE_DATE@",
+  "kernel": "@KERNEL_VERSION@",
+  "description": "@DESCRIPTION@"
+}

config/noobs/partition_setup.sh

@@ -0,0 +1,69 @@
+#!/bin/sh -x
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2013 Stephan Raue ([email protected])
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+MOUNTPOINT="/tmp/OpenELEC-System"
+
+md5sumCheck() {
+  ( cd $MOUNTPOINT
+    echo "checking MD5: $1"
+    md5sum -c $1.md5
+    if [ "$?" = "1" ]; then
+      echo "######################################################"
+      echo "#                                                    #"
+      echo "# OpenELEC failed md5 check - Installation will quit #"
+      echo "#                                                    #"
+      echo "#    Your original download was probably corrupt.    #"
+      echo "#  Please visit www.openelec.tv and get another copy #"
+      echo "#                                                    #"
+      echo "######################################################"
+      exit 1
+    fi
+    rm -rf $1.md5
+  )
+}
+
+if [ -z $part1 -o -z $part2 -o -z $id1 -o -z $id2]; then
+  echo "error: part1, part2, id1 or id2 not specified"
+  echo "actual values:"
+  echo "part1:" $part1
+  echo "part2:" $part2
+  echo "id1  :" $id1
+  echo "id2  :" $id2
+  exit 1
+fi
+
+# create mountpoint
+  mkdir -p $MOUNTPOINT
+
+# mount needed partition
+  mount $part1 $MOUNTPOINT
+
+# check md5sum
+  md5sumCheck kernel.img
+  md5sumCheck SYSTEM
+
+# create bootloader configuration
+  echo "creating bootloader configuration..."
+  echo "boot=$id1 disk=$id2 quiet" > $MOUNTPOINT/cmdline.txt
+
+# cleanup mountpoint
+  umount $MOUNTPOINT
+  rmdir $MOUNTPOINT

config/noobs/partitions.json

@@ -0,0 +1,20 @@
+{
+  "partitions": [
+    {
+      "label":                     "System",
+      "filesystem_type":           "FAT",
+      "partition_size_nominal":    128,
+      "want_maximised":            false,
+      "uncompressed_tarball_size": 110,
+      "mkfs_options":              ""
+    },
+    {
+      "label":                     "Storage",
+      "filesystem_type":           "ext4",
+      "partition_size_nominal":    864,
+      "want_maximised":            true,
+      "uncompressed_tarball_size": 10,
+      "mkfs_options":              ""
+    }
+  ]
+}

config/path

@@ -154,7 +154,7 @@ export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL
 export PKG_CONFIG=$ROOT/$TOOLCHAIN/bin/pkg-config
 
 if [ -z "$PATH" -o "$PATH" = "${PATH#$ROOT/$TOOLCHAIN/bin:}" ]; then
-  export PATH="$ROOT/$TOOLCHAIN/bin:$PATH"
+  export PATH="$ROOT/$TOOLCHAIN/bin:$ROOT/$TOOLCHAIN/sbin:$PATH"
 fi
 
 if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$ROOT/$TOOLCHAIN/lib:}" ]; then

packages/3rdparty/lib/cxxtools/build

@@ -34,6 +34,7 @@ mkdir -p .build-host && cd .build-host
             --disable-static \
             --enable-shared \
             --disable-demos \
+            --with-atomictype=pthread \
             --disable-unittest
 
 make
@@ -55,6 +56,7 @@ mkdir -p .build-target && cd .build-target
             --enable-static \
             --disable-shared \
             --disable-demos \
+            --with-atomictype=pthread \
             --disable-unittest
 
 $MAKEINSTALL

packages/3rdparty/lib/cxxtools/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="cxxtools"
-PKG_VERSION="2.1.1"
+PKG_VERSION="2.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"
@@ -33,4 +33,4 @@ PKG_SHORTDESC="cxxtools: a collection of general-purpose C++ classes"
 PKG_LONGDESC="Cxxtools is a collection of general-purpose C++ classes"
 PKG_IS_ADDON="no"
 
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"

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

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

packages/3rdparty/lib/cxxtools/patches/cxxtools-2.2-Char_operator_eq_unsigned_int.patch

@@ -0,0 +1,17 @@
+Index: cxxtools-2.2/include/cxxtools/char.h
+===================================================================
+--- cxxtools-2.2.orig/include/cxxtools/char.h	2013-05-05 14:18:00.180572107 +0300
++++ cxxtools-2.2/include/cxxtools/char.h	2013-05-05 14:18:00.176571966 +0300
+@@ -148,6 +148,12 @@
+             friend bool operator==(char a, const Char& b)
+             { return a == b.value(); }
+ 
++            //! @brief Returns $true$ if the a and b are the same character; $false$ otherwise.
++            //! @return $true$ if the a and b are the same character; $false$ otherwise.
++            friend bool operator==(const Char& a, unsigned int b)
++            { return a.value() == b; }
++
++
+             //! @brief Returns $true$ if the a and b are not the same character; $false$ otherwise.
+             //! @return $true$ if the a and b are not the same character; $false$ otherwise.
+             friend bool operator!=(const Char& a, const Char& b)

packages/3rdparty/lib/cxxtools/patches/cxxtools-2.2-hdstream_stdio.patch

@@ -0,0 +1,12 @@
+Index: cxxtools-2.0/src/hdstream.cpp
+===================================================================
+--- cxxtools-2.0.orig/src/hdstream.cpp	2011-08-08 13:07:59.567275994 +0300
++++ cxxtools-2.0/src/hdstream.cpp	2011-08-08 13:08:11.447275959 +0300
+@@ -30,6 +30,7 @@
+ #include <ios>
+ #include <iomanip>
+ #include <cctype>
++#include <cstdio>
+ 
+ namespace cxxtools
+ {

packages/3rdparty/lib/cxxtools/patches/cxxtools-2.2-no_shared_flag.patch

@@ -0,0 +1,10 @@
+Index: cxxtools-2.2/src/Makefile.am
+===================================================================
+--- cxxtools-2.2.orig/src/Makefile.am	2013-05-05 13:56:03.225204926 +0300
++++ cxxtools-2.2/src/Makefile.am	2013-05-05 13:56:14.017219885 +0300
+@@ -215,4 +215,4 @@
+ endif
+ 
+ libcxxtools_la_LIBADD = $(LIBICONV)
+-libcxxtools_la_LDFLAGS = -version-info @sonumber@ @SHARED_LIB_FLAG@
++libcxxtools_la_LDFLAGS = -version-info @sonumber@

packages/3rdparty/lib/libdvbcsa/build

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. config/options $1
+
+cd $PKG_BUILD
+
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --disable-shared \
+            --enable-static \
+            --with-sysroot=$SYSROOT_PREFIX \
+
+$MAKEINSTALL

packages/3rdparty/lib/libdvbcsa/meta

@@ -18,19 +18,20 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="kmod"
-PKG_VERSION="14"
+PKG_NAME="libdvbcsa"
+PKG_VERSION="1.1.0"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://git.profusion.mobi/cgit.cgi/kmod.git/"
-PKG_URL="http://ftp.kernel.org/pub/linux/utils/kernel/kmod/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_LICENSE="LGPL"
+PKG_SITE="http://www.videolan.org/developers/libdvbcsa.html"
+PKG_URL="http://download.videolan.org/pub/videolan/libdvbcsa/${PKG_VERSION}/libdvbcsa-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="system"
-PKG_SHORTDESC="kmod offers the needed flexibility and fine grained control over insertion, removal, configuration and listing of kernel modules."
-PKG_LONGDESC="kmod offers the needed flexibility and fine grained control over insertion, removal, configuration and listing of kernel modules."
+PKG_SECTION="lib"
+PKG_SHORTDESC="libdvbcsa is a free implementation of the DVB Common Scrambling Algorithm - DVB/CSA - with encryption and decryption capabilities"
+PKG_LONGDESC="libdvbcsa is a free implementation of the DVB Common Scrambling Algorithm - DVB/CSA - with encryption and decryption capabilities"
+
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"

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

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

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.3.0-04_tntnet-2.2-1.patch

@@ -0,0 +1,290 @@
+commit 042724e30d5690ab67a6c04aea48a16b9a3b085b
+Author: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
+Date:   Fri May 3 01:37:41 2013 +0200
+
+    Make LIVE compile and work with Tntnet and cxxtools version 2.2.
+    Thanks to Tommi Mäkitalo for his help on resolving the issues.
+    This problem was reported by Martin Gansser and by the user 'varas' in
+    the bugtracker as bug #1351. This commit fixes that bug.
+
+diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
+index 51018bb..80f145b 100644
+--- a/pages/recordings.ecpp
++++ b/pages/recordings.ecpp
+@@ -205,7 +205,11 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) {
+ 		<& rec_item_dir name=(recItem->Name()) level=(level) &>
+ <%cpp>
+ #if TNT_HAS_QUERYPARAMS
++#if TNT_QUERYPARAMS_NO_BOOL
++		tnt::QueryParams recItemParams(qparam);
++#else
+ 		tnt::QueryParams recItemParams(qparam, false);
++#endif
+ #else
+ 		cxxtools::QueryParams recItemParams(qparam, false);
+ #endif
+diff --git a/tntconfig.cpp b/tntconfig.cpp
+index 3a1fd14..3325776 100644
+--- a/tntconfig.cpp
++++ b/tntconfig.cpp
+@@ -3,7 +3,13 @@
+ #include <fstream>
+ #include <sstream>
+ #include <stdexcept>
++#include "tntfeatures.h"
++#if TNT_LOG_SERINFO
++#include <cxxtools/log.h>
++#include <cxxtools/xml/xmldeserializer.h>
++#else
+ #include <cxxtools/loginit.h>
++#endif
+ #include <tnt/sessionscope.h>
+ #include <tnt/httpreply.h>
+ #include <vdr/config.h>
+@@ -181,19 +187,67 @@ namespace vdrlive {
+ #endif
+ 
+ #if TNT_CONFIG_INTERNAL
++	namespace {
++		std::string GetResourcePath()
++		{
++#if APIVERSNUM > 10729
++			string resourceDir(Plugin::GetResourceDirectory());
++			return resourceDir;
++#else
++			string configDir(Plugin::GetConfigDirectory());
++			return configDir;
++#endif
++		}
++
++		void MapUrl(tnt::Tntnet & app, const char *rule, const char * component, std::string const & instPath, const char * pathInfo, const char * mime_type)
++		{
++#if TNT_MAPURL_NAMED_ARGS
++			tnt::Mapping::args_type argMap;
++			argMap.insert(std::make_pair("mime-type", mime_type));
++#endif
++			app.mapUrl(rule, component)
++				.setPathInfo(instPath + pathInfo)
++#if TNT_MAPURL_NAMED_ARGS
++				.setArgs(argMap);
++#else
++				.pushArg(mime_type);
++#endif
++		}
++	}
++
+ 	void TntConfig::Configure(tnt::Tntnet& app) const
+ 	{
+ 		string const configDir(Plugin::GetConfigDirectory());
+-#if APIVERSNUM > 10729
+-		string const resourceDir(Plugin::GetResourceDirectory());
+-#endif
+ 
++#if TNT_LOG_SERINFO
++		cxxtools::SerializationInfo si;
++		std::istringstream logXmlConf(
++			"<logging>\n"
++			"  <rootlogger>" + LiveSetup().GetTntnetLogLevel() + "</rootlogger>\n"
++			"  <loggers>\n"
++			"    <logger>\n"
++			"      <category>cxxtools</category>\n"
++			"      <level>" + LiveSetup().GetTntnetLogLevel() + "</level>\n"
++			"    </logger>\n"
++			"    <logger>\n"
++			"      <category>tntnet</category>\n"
++			"      <level>" + LiveSetup().GetTntnetLogLevel() + "</level>\n"
++			"    </logger>\n"
++			"  </loggers>\n"
++			"</logging>\n"
++			);
++		cxxtools::xml::XmlDeserializer d(logXmlConf);
++		d.deserialize(si);
++		log_init(si);
++#else
+ 		std::istringstream logConf(
+ 			"rootLogger=" + LiveSetup().GetTntnetLogLevel() + "\n"
+ 			"logger.tntnet=" + LiveSetup().GetTntnetLogLevel() + "\n"
+ 			"logger.cxxtools=" + LiveSetup().GetTntnetLogLevel() + "\n"
+ 			);
++
+ 		log_init(logConf);
++#endif
+ 
+ 		// +++ CAUTION +++ CAUTION +++ CAUTION +++ CAUTION +++ CAUTION +++
+ 		// ------------------------------------------------------------------------
+@@ -229,13 +283,12 @@ namespace vdrlive {
+ 
+ 		// the following selects the theme specific 'theme.css' file
+ 		// inserted by 'tadi' -- verified with above, but not counterchecked yet!
+-		app.mapUrl("^/themes/([^/]*)/css.*/(.+\\.css)", "content")
+-#if APIVERSNUM > 10729
+-			.setPathInfo(resourceDir + "/themes/$1/css/$2")
+-#else
+-			.setPathInfo(configDir + "/themes/$1/css/$2")
+-#endif
+-			.pushArg("text/css");
++		MapUrl(app,
++			   "^/themes/([^/]*)/css.*/(.+\\.css)",
++			   "content",
++			   GetResourcePath(),
++			   "/themes/$1/css/$2",
++			   "text/css");
+ 
+ 		// the following rules provide a search scheme for images. The first
+ 		// rule where a image is found, terminates the search.
+@@ -243,79 +296,82 @@ namespace vdrlive {
+ 		// 2. /img/<imgname>.<ext>
+ 		// deprecated: 3. <imgname>.<ext> (builtin images)
+ 		// inserted by 'tadi' -- verified with above, but not counterchecked yet!
+-		app.mapUrl("^/themes/([^/]*)/img.*/(.+)\\.(.+)", "content")
+-#if APIVERSNUM > 10729
+-			.setPathInfo(resourceDir + "/themes/$1/img/$2.$3")
+-#else
+-			.setPathInfo(configDir + "/themes/$1/img/$2.$3")
+-#endif
+-			.pushArg("image/$3");
+-		app.mapUrl("^/themes/([^/]*)/img.*/(.+)\\.(.+)", "content")
+-#if APIVERSNUM > 10729
+-			.setPathInfo(resourceDir + "/img/$2.$3")
+-#else
+-			.setPathInfo(configDir + "/img/$2.$3")
+-#endif
+-			.pushArg("image/$3");
++		MapUrl(app,
++			   "^/themes/([^/]*)/img.*/(.+)\\.(.+)",
++			   "content",
++			   GetResourcePath(),
++			   "/themes/$1/img/$2.$3",
++			   "image/$3");
++
++		MapUrl(app,
++			   "^/themes/([^/]*)/img.*/(.+)\\.(.+)",
++			   "content",
++			   GetResourcePath(),
++			   "/img/$2.$3",
++			   "image/$3");
+ 		// deprecated: file << "MapUrl ^/themes/([^/]*)/img.*/(.+)\\.(.+) $2@" << endl;
+ 
+ 		// Epg images
+ 		string const epgImgPath(LiveSetup().GetEpgImageDir());
+ 		if (!epgImgPath.empty()) {
+ 			// inserted by 'tadi' -- verified with above, but not counterchecked yet!
+-			app.mapUrl("^/epgimages/([^/]*)\\.([^./]+)", "content")
+-				.setPathInfo(epgImgPath + "/$1.$2")
+-				.pushArg("image/$2");
++			MapUrl(app,
++				   "^/epgimages/([^/]*)\\.([^./]+)",
++				   "content",
++				   epgImgPath,
++				   "/$1.$2",
++				   "image/$2");
+ 		}
+ 
+ 		// select additional (not build in) javascript.
+ 		// WARNING: no path components with '.' in the name are allowed. Only
+ 		// the basename may contain dots and must end with '.js'
+ 		// inserted by 'tadi' -- verified with above, but not counterchecked yet!
+-		app.mapUrl("^/js(/[^.]*)([^/]*\\.js)", "content")
+-#if APIVERSNUM > 10729
+-			.setPathInfo(resourceDir + "/js$1$2")
+-#else
+-			.setPathInfo(configDir + "/js$1$2")
+-#endif
+-			.pushArg("text/javascript");
++		MapUrl(app,
++			   "^/js(/[^.]*)([^/]*\\.js)",
++			   "content",
++			   GetResourcePath(),
++			   "/js$1$2",
++			   "text/javascript");
+ 
+ 		// map to 'css/basename(uri)'
+ 		// inserted by 'tadi' -- verified with above, but not counterchecked yet!
+-		app.mapUrl("^/css.*/(.+)", "content")
+-#if APIVERSNUM > 10729
+-			.setPathInfo(resourceDir + "/css/$1")
+-#else
+-			.setPathInfo(configDir + "/css/$1")
+-#endif
+-			.pushArg("text/css");
++		MapUrl(app,
++			   "^/css.*/(.+)",
++			   "content",
++			   GetResourcePath(),
++			   "/css/$1",
++			   "text/css");
+ 
+ 		// map to 'img/basename(uri)'
+ 		// inserted by 'tadi' -- verified with above, but not counterchecked yet!
+-		app.mapUrl("^/img.*/(.+)\\.([^.]+)", "content")
+-#if APIVERSNUM > 10729
+-			.setPathInfo(resourceDir + "/img/$1.$2")
+-#else
+-			.setPathInfo(configDir + "/img/$1.$2")
+-#endif
+-			.pushArg("image/$2");
++		MapUrl(app,
++			   "^/img.*/(.+)\\.([^.]+)",
++			   "content",
++			   GetResourcePath(),
++			   "/img/$1.$2",
++			   "image/$2");
+ 
+ 		// Map favicon.ico into img directory
+-		app.mapUrl("^/favicon.ico$", "content")
+-#if APIVERSNUM > 10729
+-			.setPathInfo(resourceDir + "/img/favicon.ico")
+-#else
+-			.setPathInfo(configDir + "/img/favicon.ico")
+-#endif
+-			.pushArg("image/x-icon");
++		MapUrl(app,
++			   "^/favicon.ico$",
++			   "content",
++			   GetResourcePath(),
++			   "/img/favicon.ico",
++			   "image/x-icon");
+ 
+ 		// takes first path components without 'extension' when it does not
+ 		// contain '.'
+ 		// modified by 'tadi' -- verified with above, but not counterchecked yet!
+ 		app.mapUrl("^/([^./]+)(.*)?", "$1");
+ 
++#if TNT_GLOBAL_TNTCONFIG
++		tnt::TntConfig::it().sessionTimeout = 86400;
++		tnt::TntConfig::it().defaultContentType = string("text/html; charset=") + LiveI18n().CharacterEncoding();
++#else
+ 		tnt::Sessionscope::setDefaultTimeout(86400);
+ 		tnt::HttpReply::setDefaultContentType(string("text/html; charset=") + LiveI18n().CharacterEncoding());
++#endif
+ 
+ 		Setup::IpList const& ips = LiveSetup().GetServerIps();
+ 		int port = LiveSetup().GetServerPort();
+diff --git a/tntfeatures.h b/tntfeatures.h
+index 6de1f88..76d3757 100644
+--- a/tntfeatures.h
++++ b/tntfeatures.h
+@@ -17,6 +17,9 @@
+ // Query params are now in tntnet and not in cxxtools
+ #define TNT_HAS_QUERYPARAMS		(TNTVERSION >= 16060)
+ 
++// Query params without boolean parameter
++#define TNT_QUERYPARAMS_NO_BOOL (TNTVERSION >= 22000)
++
+ // One can request the host part of the request url
+ #define TNT_HAS_GETHOST			(TNTVERSION >= 16060)
+ 
+@@ -26,4 +29,13 @@
+ // version of TNTNET that binds ipv6 addresses with IPV6_V6ONLY flag set to true
+ #define TNT_IPV6_V6ONLY	  	    (CXXTOOLVER >= 21000)
+ 
++// version of TNTNET with properties deserializer for logger configuration args.
++#define TNT_LOG_SERINFO			(CXXTOOLVER >= 22000)
++
++// version of TNTNET wich expects name, value mappings for Url-Mapper arguments.
++#define TNT_MAPURL_NAMED_ARGS	(TNTVERSION >= 22000)
++
++// version of TNTNET where configuration is global
++#define TNT_GLOBAL_TNTCONFIG	(TNTVERSION >= 22000)
++
+ #endif // VDR_LIVE_TNTFEATURES_H

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.3.0-04_tntnet-2.2-2.patch

@@ -0,0 +1,25 @@
+commit 69f84f95fa875c6f562294b1a6a1ea6f584d3f6c
+Author: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
+Date:   Sat May 4 22:27:09 2013 +0200
+
+    With tntnet v2.2 use also the request.getArg(<name>) function.
+    In the previous commit support for tntnet 2.2 was added. The URL
+    mapping changed in that version and allows now named arguments. This
+    change makes uses of this feature now.
+
+diff --git a/pages/content.ecpp b/pages/content.ecpp
+index 27d827c..cde092f 100644
+--- a/pages/content.ecpp
++++ b/pages/content.ecpp
+@@ -17,7 +17,11 @@ bool logged_in(false);
+ 
+ string mime("image/png");
+ if (request.getArgsCount() > 0) {
++#if TNT_MAPURL_NAMED_ARGS
++	mime = request.getArg("mime-type");
++#else
+ 	mime = request.getArg(0);
++#endif
+ 	// dsyslog("vdrlive::content found mime arg (%s)", mime.c_str());
+ }
+ reply.setContentType(mime);

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

@@ -36,5 +36,6 @@ cd $PKG_BUILD
        VDRSRC="../$VDR_DIR" \
        LIBDIR="." \
        LOCALEDIR="./locale" \
+       LIBDVBCSA=1 \
        CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
 

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

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-dvbapi"
-PKG_VERSION="555272d"
+PKG_VERSION="2be5e15"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="vdr openssl"
-PKG_BUILD_DEPENDS="toolchain vdr openssl"
+PKG_BUILD_DEPENDS="toolchain vdr openssl libdvbcsa"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="TV"

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

@@ -20,6 +20,9 @@
 
 PKG_NAME="vdr-plugin-vnsiserver"
 PKG_VERSION="e3cd383"
+if [ "$XBMC" = "master" ]; then
+  PKG_VERSION="cd5023b"
+fi
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

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

@@ -0,0 +1,101 @@
+diff --git a/Makefile b/Makefile
+index 8f37c92..94869aa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,7 +7,7 @@
+ # 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.
+ 
+-PLUGIN = vnsiserver4
++PLUGIN = vnsiserver
+ 
+ ### The version number of this plugin (taken from the main source file):
+ 
+@@ -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-xvdr/meta

@@ -20,6 +20,9 @@
 
 PKG_NAME="vdr-plugin-xvdr"
 PKG_VERSION="33afe59"
+if [ "$XBMC" = "master" ]; then
+  PKG_VERSION="6249892"
+fi
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="vdr"
-PKG_VERSION="2.0.1"
+PKG_VERSION="2.0.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/web/tntnet/build

@@ -27,13 +27,14 @@ cd $PKG_BUILD
 setup_toolchain host
 
 mkdir -p .build-host && cd .build-host
+
 ../configure --host=$HOST_NAME \
             --build=$HOST_NAME \
             --prefix=$ROOT/$TOOLCHAIN \
             --disable-static \
             --enable-shared \
+            --disable-unittest \
             --with-server=no \
-            --with-cgi=no \
             --with-sdk=yes \
             --with-demos=no \
             --with-epoll=yes \
@@ -57,11 +58,13 @@ mkdir -p .build-target && cd .build-target
             --sysconfdir=/etc \
             --disable-static \
             --enable-shared \
+            --disable-unittest \
+            --with-sysroot=$SYSROOT_PREFIX \
             --with-server=no \
-            --with-cgi=no \
-            --with-sdk=yes \
+            --with-sdk=no \
             --with-demos=no \
             --with-epoll=yes \
+            --with-ssl=no \
             --with-stressjob=no
 
 $MAKEINSTALL

packages/3rdparty/web/tntnet/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="tntnet"
-PKG_VERSION="2.1"
+PKG_VERSION="2.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"
@@ -33,4 +33,4 @@ PKG_SHORTDESC="tntnet: C++ Dynamite for the Web"
 PKG_LONGDESC="Tntnet is a modular, multithreaded, high performance webapplicationserver for C++"
 PKG_IS_ADDON="no"
 
-PKG_AUTORECONF="yes"
+PKG_AUTORECONF="no"

packages/3rdparty/web/tntnet/patches/tntnet-2.2-fix_gcc47.patch

@@ -0,0 +1,18 @@
+Description: Include unistd.h to fix FTBFS with gcc-4.7
+ tntnet (2.1-1ubuntu1) quantal; urgency=low
+ .
+   * Add missing header to fix FTBFS with gcc4.7 on non-amd64 archs
+Author: Micah Gersten <[email protected]>
+
+Index: tntnet-2.2/framework/defcomp/static.cpp
+===================================================================
+--- tntnet-2.2.orig/framework/defcomp/static.cpp	2013-04-21 22:13:57.000000000 +0300
++++ tntnet-2.2/framework/defcomp/static.cpp	2013-05-19 23:12:17.000000000 +0300
+@@ -34,6 +34,7 @@
+ #include <tnt/http.h>
+ #include <tnt/httpheader.h>
+ #include <tnt/comploader.h>
++#include <unistd.h>
+ #include <fstream>
+ #include <cxxtools/log.h>
+ #include <cxxtools/systemerror.h>

packages/addons/driver/hdhomerun/changelog.txt

@@ -1,3 +1,8 @@
+3.1.6
+  rebuild
+3.1.5
+  get tuner id with command 'hdhomerun_config discover' and
+  set number of tuners manually
 3.1.4
   get tuner id from /var/log/messages
 3.1.3

packages/addons/driver/hdhomerun/meta

@@ -20,13 +20,13 @@
 
 PKG_NAME="hdhomerun"
 PKG_VERSION="3.2"
-PKG_REV="4"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS=""
 PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="A linux DVB driver for the HDHomeRun (http://www.silicondust.com)."

packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh

@@ -63,39 +63,46 @@ if [ -z "$(pidof userhdhomerun)" ]; then
     cp $HDHR_ADDON_HOME/dvbhdhomerun.conf $DVBHDHOMERUN_CONF_TMP
 
     # get tuner serial numbers
-    SERIALS=$(cat /var/config/hdhomerun-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_\(.*\)_DVBMODE=.*|\1-\2|gp' | sort | uniq)
+    SERIALS=$(cat /var/config/hdhomerun-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_DVBMODE=.*|\1|gp' | sort | uniq)
     . /var/config/hdhomerun-addon.conf
 
-    for SERIAL in $SERIALS; do
-      SERIAL_VAR=$(echo $SERIAL | sed 's|-|_|')
-      DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_DVBMODE)
-      FULLNAME=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_FULLNAME)
-      DISABLE=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_DISABLE)
+    for SERIAL_UNIQ in $SERIALS; do
+      DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_DVBMODE)
+      FULLNAME=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_FULLNAME)
+      DISABLE=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_DISABLE)
+      NUMBERS=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_NUMBERS)
 
-      [ "$DVBMODE" = "auto" ] && DVBMODE=""
+      NUMBERS=$(( $NUMBERS -1 ))
+      NUMBERS=$(( $NUMBERS *1 ))
 
-      # remove setttings for this tuner
-      awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^tuner_type=|^use_full_name=|^disable=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $DVBHDHOMERUN_CONF_TMP >${DVBHDHOMERUN_CONF_TMP}-types
-      mv ${DVBHDHOMERUN_CONF_TMP}-types $DVBHDHOMERUN_CONF_TMP
-      echo "" >>$DVBHDHOMERUN_CONF_TMP
-      # remove empty lines at the end of file
-      sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $DVBHDHOMERUN_CONF_TMP
+      for i in $(seq 0 $NUMBERS); do
+        SERIAL="$SERIAL_UNIQ-$i"
 
-      ADDNEW=true
-      if [ -n "$DVBMODE" ]; then
-        [ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
-        echo "tuner_type=$DVBMODE" >>$DVBHDHOMERUN_CONF_TMP
-      fi
-      if [ "$FULLNAME" = "true" ]; then
-        [ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
-        echo "use_full_name=true" >>$DVBHDHOMERUN_CONF_TMP
-      fi
-      if [ "$DISABLE" = "true" ]; then
-        [ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
-        echo "disable=true" >>$DVBHDHOMERUN_CONF_TMP
-      fi
+        [ "$DVBMODE" = "auto" ] && DVBMODE=""
 
-      echo "" >>$DVBHDHOMERUN_CONF_TMP
+        # remove setttings for this tuner
+        awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^tuner_type=|^use_full_name=|^disable=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $DVBHDHOMERUN_CONF_TMP >${DVBHDHOMERUN_CONF_TMP}-types
+        mv ${DVBHDHOMERUN_CONF_TMP}-types $DVBHDHOMERUN_CONF_TMP
+        echo "" >>$DVBHDHOMERUN_CONF_TMP
+        # remove empty lines at the end of file
+        sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $DVBHDHOMERUN_CONF_TMP
+
+        ADDNEW=true
+        if [ -n "$DVBMODE" ]; then
+          [ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
+          echo "tuner_type=$DVBMODE" >>$DVBHDHOMERUN_CONF_TMP
+        fi
+        if [ "$FULLNAME" = "true" ]; then
+          [ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
+          echo "use_full_name=true" >>$DVBHDHOMERUN_CONF_TMP
+        fi
+        if [ "$DISABLE" = "true" ]; then
+          [ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
+          echo "disable=true" >>$DVBHDHOMERUN_CONF_TMP
+        fi
+
+        echo "" >>$DVBHDHOMERUN_CONF_TMP
+      done
     done
 
     # remove logging from libhdhomerun library

packages/addons/driver/hdhomerun/source/default.py

@@ -27,10 +27,8 @@ __cwd__           = __settings__.getAddonInfo('path')
 __resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
 __settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
 
-__hdhomerun_log__ = '/var/log/dvbhdhomerun.log'
-
 if __name__ == "__main__" and len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
   sys.path.append(__resources_lib__)
   from functions import refresh_hdhomerun_tuners
-  refresh_hdhomerun_tuners(__settings_xml__, __hdhomerun_log__)
+  refresh_hdhomerun_tuners(__settings_xml__)
   __settings__.openSettings()

packages/addons/driver/hdhomerun/source/resources/language/English/strings.xml

@@ -11,5 +11,6 @@
   <string id="9005">Enable modifying settings</string>
   <string id="9010">Refresh tuners... (press me)</string>
   <string id="9020">    use full name</string>
+  <string id="9025">    number of tuners</string>
   <string id="9030">    disabled</string>
 </strings>

packages/addons/driver/hdhomerun/source/resources/lib/functions.py

@@ -46,25 +46,28 @@ def settings_restore(settings_xml):
 
 ######################################################################################################
 # get hdhomerun supported devices on a system (only name like 101ADD2B-0)
-def get_devices_hdhomerun(hdhomerun_log):
+def get_devices_hdhomerun():
   tuners = []
   try:
-    for line in open('/var/log/messages', 'r'):
-      if line.find('HDHomeRun'):
-      line = line.strip()
-        #Jul 17 19:22:46 user user.info kernel: [   10.587811] HDHomeRun HDHomeRun.0: DVB: registering adapter 0 frontend 0 (HDHomeRun DVB-C 12345678-0)...
-        match = re.search(r'.*\[.+\] HDHomeRun .+ registering adapter .+ \(HDHomeRun .+ (.+)\).+', line)
+    p = os.popen("hdhomerun_config discover", "r")
+    while 1:
+      line = p.readline()
+      if not line:
+        break
+      else:
+        str = line.strip()
+        match = re.search(r'hdhomerun device (.+) found at .+', line)
         if match:
           name = match.group(1)
-        tuners.append(name)
+          print name
+          tuners.append(name)
   except IOError:
-    print 'Error reading hdhomerun log file /var/log/messages'
+    print 'Error getting hdhomerun tuners info'
   return tuners
 
   """
-root ~ # grep HDHomeRun /var/log/messages
-Jul 17 19:22:46 user user.info kernel: [   10.587811] HDHomeRun HDHomeRun.0: DVB: registering adapter 0 frontend 0 (HDHomeRun DVB-C 12345678-0)...
-Jul 17 19:22:46 user user.info kernel: [   10.588602] HDHomeRun HDHomeRun.1: DVB: registering adapter 1 frontend 0 (HDHomeRun DVB-C 12345678-1)...
+openelec:~ # hdhomerun_config discover
+hdhomerun device 12345678 found at 192.168.0.3
   """
 
 ######################################################################################################
@@ -154,11 +157,13 @@ def remove_old_tuners(xmldoc):
 # add new hdhomerun tuners
 def add_hdhomerun(xmldoc, node_cat, tuners):
   for ix, tuner in enumerate(tuners):
-    tuner_var = tuner.replace('-', '_')
+    #tuner_var = tuner.replace('-', '_')
+    tuner_var = tuner
+    print tuner
 
     node1 = xmldoc.createElement("setting")
     node1.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DVBMODE')
-    node1.setAttribute("label", tuner)
+    node1.setAttribute("label", "tuner serial " + tuner_var)
     node1.setAttribute("type", 'labelenum')
     node1.setAttribute("default", 'auto')
     node1.setAttribute("values", 'auto|ATSC|DVB-C|DVB-T')
@@ -172,12 +177,20 @@ def add_hdhomerun(xmldoc, node_cat, tuners):
     node_cat.appendChild(node2)
 
     node3 = xmldoc.createElement("setting")
-    node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DISABLE')
-    node3.setAttribute("label", '9030')
-    node3.setAttribute("type", 'bool')
-    node3.setAttribute("default", 'false')
+    node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_NUMBERS')
+    node3.setAttribute("label", '9025')
+    node3.setAttribute("type", 'labelenum')
+    node3.setAttribute("default", '2')
+    node3.setAttribute("values", '1|2|3|4|5|6|7|8')
     node_cat.appendChild(node3)
 
+    node4 = xmldoc.createElement("setting")
+    node4.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DISABLE')
+    node4.setAttribute("label", '9030')
+    node4.setAttribute("type", 'bool')
+    node4.setAttribute("default", 'false')
+    node_cat.appendChild(node4)
+
   # for tuner
 
 ######################################################################################################
@@ -249,9 +262,9 @@ def save_settings(settings_xml, xmldoc):
 
 ######################################################################################################
 # refresh hdhomerun tuners in settings.xml file
-def refresh_hdhomerun_tuners(settings_xml, hdhomerun_log):
+def refresh_hdhomerun_tuners(settings_xml):
   settings_backup(settings_xml)
-  tuners = get_devices_hdhomerun(hdhomerun_log)
+  tuners = get_devices_hdhomerun()
   xmldoc = parse_settings(settings_xml)
   if xmldoc == None:
     print 'No hdhomerun tuners found'

packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power

@@ -39,7 +39,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
   LOCKFILE="$LOCKDIR/hdhomerun"
 
   case "$1" in
-    hibernate|suspend)
+    hibernate|suspend|pre)
       if [ -n "$(pidof userhdhomerun)" ]; then
         progress "Shutting down HDHomeRun driver for suspending..."
         mkdir -p "$LOCKDIR"
@@ -48,7 +48,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
       fi
       ;;
 
-    thaw|resume)
+    thaw|resume|post)
       if [ -f "$LOCKFILE" ]; then
         # driver started within Tvheadend/VDR
         rm -f "$LOCKFILE"

packages/addons/driver/sundtek-mediatv/changelog.txt

@@ -1,3 +1,5 @@
+3.1.3
+  rebuild
 3.1.2
   new addon settings option to enable suspend/resume driver actions
 3.1.1

packages/addons/driver/sundtek-mediatv/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="3.1"
-PKG_REV="2"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"

packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power

@@ -39,7 +39,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
   LOCKFILE="$LOCKDIR/sundtek-mediatv"
 
   case "$1" in
-    hibernate|suspend)
+    hibernate|suspend|pre)
       if [ -n "$(pidof mediasrv)" ]; then
         progress "Shutting down Sundtek DVB driver for suspending..."
         mkdir -p "$LOCKDIR"
@@ -48,7 +48,7 @@ if [ "$SUSPEND_DRIVER" = "true" ]; then
       fi
       ;;
 
-    thaw|resume)
+    thaw|resume|post)
       if [ -f "$LOCKFILE" ]; then
         # driver started within Tvheadend/VDR
         rm -f "$LOCKFILE"

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

@@ -1,3 +1,9 @@
+3.1.3
+- update to boblightd-474
+
+3.1.2
+- rebuild
+
 3.1.1
 - rebuild for OpenELEC-3.2
 

packages/addons/service/multimedia/boblightd/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="boblightd"
-PKG_VERSION="467"
-PKG_REV="1"
+PKG_VERSION="474"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://code.google.com/p/boblight"

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

@@ -39,23 +39,25 @@ BOBLIGHT_X11="$ADDON_HOME/boblight.X11"
 
 LOCKDIR="/var/lock/"
 LOCKFILE="boblightd.disabled"
+LOCKFILE_SLEEP="boblightd.sleep"
 
 export LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH"
 
 cp -R $ADDON_DIR/config/*.sample $ADDON_HOME > $LOG_FILE 2>&1
 
-if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
-  rm -rf "$LOCKDIR/$LOCKFILE"
-fi
+rm -rf "$LOCKDIR/$LOCKFILE_SLEEP" &>/dev/null
+boblightd.stop
+rm -rf "$LOCKDIR/$LOCKFILE" &>/dev/null
 
 if [ -f "$BOBLIGHT_CONFIG" ] ; then
   if [ ! "$(pidof boblightd)" ]; then
     while [ true ] ; do
+      while [ -f "$LOCKDIR/$LOCKFILE_SLEEP" ] ; do
+        usleep 100000
+      done
       if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
         break
       fi
-      # Make sure the xserver has started up
-      wait_for_xorg
       # Start the boblight daemon
       boblightd -c $BOBLIGHT_CONFIG >> $LOG_FILE 2>&1
     done &
@@ -64,11 +66,12 @@ if [ -f "$BOBLIGHT_CONFIG" ] ; then
   if [ -e $BOBLIGHT_X11 ]; then
     if [ ! "$(pidof boblight-X11)" ]; then
       while [ true ] ; do
+        while [ -f "$LOCKDIR/$LOCKFILE_SLEEP" ] ; do
+          usleep 100000
+        done
         if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
           break
         fi
-        # Make sure the xserver has started up
-        wait_for_xorg
         # Start the boblight daemon
         boblight-X11 >> $LOG_FILE 2>&1
       done &

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

@@ -24,14 +24,22 @@
 
 LOCKDIR="/var/lock/"
 LOCKFILE="boblightd.disabled"
+LOCKFILE_SLEEP="boblightd.sleep"
 
 mkdir -p "$LOCKDIR"
-touch "$LOCKDIR/$LOCKFILE"
-
-if [ "$(pidof boblightd)" ];then
-  killall boblightd
+if [ ! -e "$LOCKDIR/$LOCKFILE_SLEEP" ] ; then
+  touch "$LOCKDIR/$LOCKFILE"
 fi
 
-if [ "$(pidof boblight-X11)" ];then
-  killall boblight-X11
+if [ "$(pidof boblightd)" ] ; then
+  killall -q boblightd
+  killall -q boblight-X11
+  for seq in `seq 1 10` ; do
+    if [ ! "$(pidof boblightd boblight-X11)" ] ; then
+      break
+    fi
+    usleep 200000
+  done
+  killall -q -9 boblightd
+  killall -q -9 boblight-X11
 fi

packages/addons/service/multimedia/boblightd/source/sleep.d/boblightd.power

@@ -22,19 +22,18 @@
 
 . /etc/profile
 
-LOCKFILE="/var/lock/boblightd.sleep"
+LOCKFILE_SLEEP="/var/lock/boblightd.sleep"
 
 case "$1" in
-  hibernate|suspend)
+  hibernate|suspend|pre)
     progress "Shutting down boblightd for suspending..."
+    touch $LOCKFILE_SLEEP
     boblightd.stop
-    touch $LOCKFILE
     ;;
-  thaw|resume)
-    progress "Restarting boblightd for wakeup..."
-    if [ -f "$LOCKFILE" ] ; then
-      rm -rf "$LOCKFILE"
-      boblightd.start
+  thaw|resume|post)
+    if [ -f "$LOCKFILE_SLEEP" ] ; then
+      progress "Restarting boblightd for wakeup..."
+      rm -rf "$LOCKFILE_SLEEP"
     fi
     ;;
   *) exit $NA

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

@@ -1,3 +1,6 @@
+3.1.4
+- rebuild
+
 3.1.3
 - update to TVHeadend 3.4.27
 

packages/addons/service/multimedia/tvheadend/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="tvheadend"
 PKG_VERSION="3.4.27"
-PKG_REV="3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

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

@@ -24,6 +24,7 @@
 
 LOCKDIR="/var/lock/"
 LOCKFILE="tvheadend.disabled"
+LOCKFILE_SLEEP="tvheadend.sleep"
 
 ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.tvheadend"
 ADDON_SYS_DIR="/usr/lib/xbmc/addons/service.multimedia.tvheadend"
@@ -57,6 +58,8 @@ if [ -d $HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend ] ; the
 fi
 ##
 
+mkdir -p $ADDON_HOME
+
 if [ ! -f "$ADDON_SETTINGS" ]; then
   if [ -f $ADDON_DIR/settings-default.xml ]; then
     cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
@@ -111,25 +114,24 @@ mkdir -p /var/config
 . /var/config/tvheadend.conf.default
 . /var/config/tvheadend.conf
 
-
-mkdir -p $ADDON_HOME
+  rm -rf "$LOCKDIR/$LOCKFILE_SLEEP" &>/dev/null
+  tvheadend.stop
+  rm -rf "$LOCKDIR/$LOCKFILE" &>/dev/null
   if [ ! "$(pidof $ADDON_BIN)" ]; then
-    # start userspace DVB driver/addon
-    for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
-      driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
-      logger -t Tvheadend "### Loading userspace DVB driver: $driver_dvb_name ###"
-      # use ". " because of variable export
-      . $driver_dvb
-    done
-
-    if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
-      rm -rf "$LOCKDIR/$LOCKFILE"
-    fi
-
     while [ true ] ; do
+      while [ -f "$LOCKDIR/$LOCKFILE_SLEEP" ] ; do
+        usleep 100000
+      done
       if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
         break
       fi
+      # start userspace DVB driver/addon
+      for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
+        driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
+        logger -t Tvheadend "### Loading userspace DVB driver: $driver_dvb_name ###"
+        # use ". " because of variable export
+        . $driver_dvb
+      done
       # (wait for) at least 1 adapter (xbmc allows to set 0)
       [ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
       if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then

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

@@ -24,12 +24,22 @@
 
 LOCKDIR="/var/lock/"
 LOCKFILE="tvheadend.disabled"
+LOCKFILE_SLEEP="tvheadend.sleep"
 
 ADDON_BIN="tvheadend"
 
 mkdir -p "$LOCKDIR"
-touch "$LOCKDIR/$LOCKFILE"
+if [ ! -e "$LOCKDIR/$LOCKFILE_SLEEP" ] ; then
+  touch "$LOCKDIR/$LOCKFILE"
+fi
 
-if [ "$(pidof $ADDON_BIN)" ];then
-  killall $ADDON_BIN
+if [ "$(pidof $ADDON_BIN)" ] ; then
+  killall -q $ADDON_BIN
+  for seq in `seq 1 10` ; do
+    if [ ! "$(pidof $ADDON_BIN)" ] ; then
+      break
+    fi
+    usleep 200000
+  done
+  killall -q -9 $ADDON_BIN
 fi

packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power

@@ -26,40 +26,29 @@ ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.tvheadend"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | sed 's|.*value="\([^"]*\)".*|\1|g'`
 
-LOCKFILE="/var/lock/tvheadend.sleep"
+LOCKFILE_SLEEP="/var/lock/tvheadend.sleep"
 
 ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.tvheadend"
 
 case "$1" in
-  hibernate|suspend)
+  hibernate|suspend|pre)
     if [ "$(pidof tvheadend)" ];then
       progress "Shutting down HTS TVHeadend for suspending..."
-      xbmc-send -a "Notification(tvheadend, Shutting down HTS TVHeadend for suspend..., 5000, $ADDON_DIR/icon.png)"
+      touch $LOCKFILE_SLEEP
       tvheadend.stop
-      touch $LOCKFILE
       for module in $REMOVE_MODULES ; do
         rmmod -w $module
       done
     fi
     ;;
 
-  thaw|resume)
-    if [ -f "$LOCKFILE" ] ; then
+  thaw|resume|post)
+    if [ -f "$LOCKFILE_SLEEP" ] ; then
       progress "Restarting HTS TVHeadend for wakeup..."
-      xbmc-send -a "Notification(tvheadend, Restarting HTS TVHeadend for wakeup..., 5000, $ADDON_DIR/icon.png)"
       for module in $REMOVE_MODULES ; do
         modprobe $module
       done
-      tvheadend.stop
-      for seq in `seq 1 10` ; do
-        if [ ! "$(pidof tvheadend)" ];then
-          break
-        fi
-        usleep 500000
-      done
-      killall -9 tvheadend &>/dev/null
-      rm -rf "$LOCKFILE"
-      tvheadend.start
+      rm -rf "$LOCKFILE_SLEEP"
     fi
     ;;
   *) exit $NA

packages/addons/service/multimedia/vdr-addon/addon

@@ -71,6 +71,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
   cp -PR $BUILD/vdr-plugin-xvdr-*/xvdr/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
+  cp -PR $BUILD/vdr-plugin-xvdr-*/xvdr/xvdr.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
   cp -PR $BUILD/vdr-plugin-vnsiserver-*/vnsiserver/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
@@ -80,7 +81,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $BUILD/tntnet-[0-9]*/.build-target/framework/common/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -P $BUILD/tntnet-[0-9]*/.build-target/framework/common/.libs/libtntnet.so.11.0.0 $ADDON_BUILD/$PKG_ADDON_ID/lib/libtntnet.so.11
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
   cp -PR $BUILD/vdr-plugin-streamdev-*/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server

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

@@ -1,3 +1,9 @@
+3.1.4
+- vdr-plugin-dvbapi: switch to libdvbcsa
+
+3.1.3
+- rebuild
+
 3.1.2
 - fix unloading multiple modules on suspend
 

packages/addons/service/multimedia/vdr-addon/meta

@@ -21,7 +21,7 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="3.1"
-PKG_REV="2"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"

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

@@ -32,6 +32,7 @@ check_tmpfs_mount() {
 
 LOCKDIR="/var/lock/"
 LOCKFILE="vdr.disabled"
+LOCKFILE_SLEEP="vdr.sleep"
 
 ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.vdr-addon"
 ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.vdr-addon"
@@ -148,22 +149,26 @@ MYDATA
 
 )
 
+rm -rf "$LOCKDIR/$LOCKFILE_SLEEP" &>/dev/null
+vdr.stop
+rm -rf "$LOCKDIR/$LOCKFILE" &>/dev/null
+
 if [ ! "$(pidof vdr.bin)" ];then
-  # start userspace DVB driver/addon
-  for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
-    driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
-    logger -t VDR "### Loading userspace DVB driver: $driver_dvb_name ###"
-    # use ". " because of variable export
-    . $driver_dvb
-  done
-  if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
-    rm -rf "$LOCKDIR/$LOCKFILE"
-  fi
   while [ true ] ; do
+    while [ -f "$LOCKDIR/$LOCKFILE_SLEEP" ] ; do
+      usleep 100000
+    done
     if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
       umount /var/run/vdr 2>&1
       break
     fi
+    # start userspace DVB driver/addon
+    for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
+      driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
+      logger -t VDR "### Loading userspace DVB driver: $driver_dvb_name ###"
+      # use ". " because of variable export
+      . $driver_dvb
+    done
     # (wait for) at least 1 adapter (xbmc allows to set 0)
     [ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
     if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then

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

@@ -24,11 +24,20 @@
 
 LOCKDIR="/var/lock/"
 LOCKFILE="vdr.disabled"
+LOCKFILE_SLEEP="vdr.sleep"
 
 mkdir -p "$LOCKDIR"
-touch "$LOCKDIR/$LOCKFILE"
-
-if [ "$(pidof vdr.bin)" ];then
-  killall vdr.bin
+if [ ! -e "$LOCKDIR/$LOCKFILE_SLEEP" ] ; then
+  touch "$LOCKDIR/$LOCKFILE"
 fi
 
+if [ "$(pidof vdr.bin)" ] ; then
+  killall -q vdr.bin
+  for seq in `seq 1 10` ; do
+    if [ ! "$(pidof vdr.bin)" ] ; then
+      break
+    fi
+    usleep 200000
+  done
+  killall -q -9 vdr.bin
+fi

packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power

@@ -27,39 +27,28 @@ ADDON_CONFIG_DIR="$ADDON_HOME/config"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | sed 's|.*value="\([^"]*\)".*|\1|g'`
 
-LOCKFILE="/var/lock/vdr.sleep"
+LOCKFILE_SLEEP="/var/lock/vdr.sleep"
 
 ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.vdr-addon"
 
 case "$1" in
-  hibernate|suspend)
+  hibernate|suspend|pre)
     if [ "$(pidof vdr.bin)" ];then
       progress "Shutting down vdr for suspending..."
-      xbmc-send -a "Notification(vdr, Shutting down vdr for suspend..., 5000, $ADDON_DIR/icon.png)"
+      touch $LOCKFILE_SLEEP
       vdr.stop
-      touch $LOCKFILE
       for module in $REMOVE_MODULES ; do
         rmmod -w $module
       done
     fi
     ;;
-  thaw|resume)
-    if [ -f "$LOCKFILE" ] ; then
+  thaw|resume|post)
+    if [ -f "$LOCKFILE_SLEEP" ] ; then
       progress "Restarting vdr for wakeup..."
-      xbmc-send -a "Notification(vdr, Restarting vdr for wakeup..., 5000, $ADDON_DIR/icon.png)"
       for module in $REMOVE_MODULES ; do
         modprobe $module
       done
-      vdr.stop
-      for seq in `seq 1 10` ; do
-        if [ ! "$(pidof vdr.bin)" ];then
-          break
-        fi
-        usleep 500000
-      done
-      killall -9 vdr.bin &>/dev/null
-      rm -rf "$LOCKFILE"
-      vdr.start
+      rm -rf "$LOCKFILE_SLEEP"
     fi
     ;;
   *) exit $NA

packages/audio/alsa/alsa-lib/package.mk

@@ -35,13 +35,16 @@ PKG_LONGDESC="ALSA (Advanced Linux Sound Architecture) is the next generation Li
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
-  PKG_DEPENDS="$PKG_DEPENDS alsa-plugins"
+if [ "$DEBUG" = yes ]; then
+  ALSA_DEBUG=--with-debug
+else
+  ALSA_DEBUG=--without-debug
 fi
 
 # package specific configure options
 PKG_CONFIGURE_OPTS_TARGET="--with-plugindir=/usr/lib/alsa \
                            --disable-python \
+                           $ALSA_DEBUG \
                            --disable-dependency-tracking"
 
 pre_configure_target() {
@@ -64,6 +67,6 @@ post_makeinstall_target() {
     cp -PR $PKG_DIR/config/modprobe.d $INSTALL/usr/config
 }
 
-post_install_target() {
+post_install() {
   add_group audio 63
 }

packages/audio/alsa/alsa-plugins/config/samplerate.conf

@@ -1,11 +0,0 @@
-# samplerate plugin configuration
-# $Id: samplerate.conf,v 1.2 2008/03/09 15:50:49 lkundrak Exp $
-
-pcm.my_rate {
-	type rate
-	slave.pcm "hw"
-	converter "samplerate"
-	hint {
-		description "External rate converter"
-	}
-}

packages/audio/alsa/alsa-plugins/config/speex.conf

@@ -1,11 +0,0 @@
-# samplerate plugin configuration
-# $Id$
-
-pcm.my_rate {
-	type rate
-	slave.pcm "hw"
-	converter "speexrate"
-	hint {
-		description "Rate Converter Plugin Using Speex Resampler"
-	}
-}

packages/audio/alsa/alsa-plugins/config/upmix.conf

@@ -1,10 +0,0 @@
-# upmix plugin configuration
-# $Id: upmix.conf,v 1.2 2008/03/09 15:50:49 lkundrak Exp $
-
-pcm.upmix51 {
-	type upmix
-	slave.pcm "surround51"
-	hint {
-		description "Upmixer channel expander"
-	}
-}

packages/audio/alsa/alsa-plugins/config/vdownmix.conf

@@ -1,18 +0,0 @@
-# vdownmix plugin configuration
-# $Id$
-
-pcm.!surround51 {
-	type vdownmix
-	slave.pcm "default"
-	hint {
-		description "Downmixer to stereo from surround51"
-	}
-}
-
-pcm.!surround40 {
-	type vdownmix
-	slave.pcm "default"
-	hint {
-		description "Downmixer to stereo from surround40"
-	}
-}

packages/audio/alsa/alsa-plugins/package.mk

@@ -1,56 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="alsa-plugins"
-PKG_VERSION="1.0.27"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.alsa-project.org/"
-PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="speex"
-PKG_BUILD_DEPENDS_TARGET="toolchain speex libsamplerate"
-PKG_PRIORITY="optional"
-PKG_SECTION="audio"
-PKG_SHORTDESC="alsa-plugins: Advanced Linux Sound Architecture Plugins"
-PKG_LONGDESC="ALSA (Advanced Linux Sound Architecture) is the next generation Linux Sound API. It provides much finer (->better) access to the sound hardware, has a unbeatable mixer API and supports stuff like multi channel hardware, digital outs and ins, uninterleaved sound data access, and an oss emulation layer (for the old applications). It is the prefered API for professional sound apps under Linux."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
-
-# package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--with-plugindir=/usr/lib/alsa \
-                           --disable-jack \
-                           --enable-samplerate \
-                           --disable-avcodec \
-                           --with-speex=lib"
-
-if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
-  PKG_DEPENDS="$PKG_DEPENDS pulseaudio"
-  PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET pulseaudio"
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-pulseaudio"
-else
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-pulseaudio"
-fi
-
-post_makeinstall_target() {
-  mkdir -p $INSTALL/usr/share/alsa/pcm
-  cp -R $PKG_DIR/config/*.conf $INSTALL/usr/share/alsa/pcm
-}

packages/audio/libsndfile/package.mk

@@ -1,50 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="libsndfile"
-PKG_VERSION="1.0.25"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="LGPL"
-PKG_SITE="http://www.mega-nerd.com/libsndfile/"
-PKG_URL="http://www.mega-nerd.com/$PKG_NAME/files/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="alsa-lib flac libvorbis libogg"
-PKG_BUILD_DEPENDS_TARGET="toolchain alsa-lib flac libvorbis libogg"
-PKG_PRIORITY="optional"
-PKG_SECTION="audio"
-PKG_SHORTDESC="libsndfile: A library for accessing various audio file formats"
-PKG_LONGDESC="libsndfile is a C library for reading and writing sound files such as AIFF, AU, WAV, and others through one standard interface. It can currently read/write 8, 16, 24 and 32-bit PCM files as well as 32 and 64-bit floating point WAV files and a number of compressed formats. It compiles and runs on *nix, MacOS, and Win32."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
-
-# package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
-                           --disable-sqlite \
-                           --enable-alsa \
-                           --enable-external-libs \
-                           --disable-experimental \
-                           --disable-test-coverage \
-                           --enable-largefile \
-                           --with-gnu-ld"
-
-post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
-}

packages/audio/libsndfile/patches/libsndfile-1.0.25-configure.patch

@@ -1,25 +0,0 @@
-diff -Naur libsndfile-1.0.25-old/configure.ac libsndfile-1.0.25-new/configure.ac
---- libsndfile-1.0.25-old/configure.ac	2011-07-13 01:59:57.000000000 -0700
-+++ libsndfile-1.0.25-new/configure.ac	2011-07-13 17:04:14.000000000 -0700
-@@ -18,9 +18,6 @@
- AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
- AM_SILENT_RULES([yes])
- 
--dnl Add parameters for aclocal
--AC_SUBST(ACLOCAL_AMFLAGS, "-I M4")
--
- AC_LANG([C])
- 
- AC_PROG_CC
-diff -Naur libsndfile-1.0.25-old/Makefile.am libsndfile-1.0.25-new/Makefile.am
---- libsndfile-1.0.25-old/Makefile.am	2011-07-07 02:47:24.000000000 -0700
-+++ libsndfile-1.0.25-new/Makefile.am	2011-07-13 17:04:14.000000000 -0700
-@@ -2,6 +2,8 @@
- 
- DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
- 
-+ACLOCAL_AMFLAGS = -I M4
-+
- if BUILD_OCTAVE_MOD
- octave_dir = Octave
- endif

packages/audio/pulseaudio/config/asound.conf

@@ -1,13 +0,0 @@
-#
-# Place your global alsa-lib configuration here...
-#
-
-@hooks [
-	{
-		func load
-		files [
-			"/etc/alsa/pulse-default.conf"
-		]
-		errors false
-	}
-]

packages/audio/pulseaudio/config/default.pa

@@ -1,154 +0,0 @@
-#!/usr/bin/pulseaudio -nF
-#
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PulseAudio 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 Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-# This startup script is used only if PulseAudio is started per-user
-# (i.e. not in system mode)
-
-.nofail
-
-### Load something into the sample cache
-#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
-#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
-#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
-#load-sample-lazy pulse-access /usr/share/sounds/generic.wav
-
-.fail
-
-### Automatically restore the volume of streams and devices
-load-module module-device-restore
-load-module module-stream-restore
-load-module module-card-restore
-
-### Automatically augment property information from .desktop files
-### stored in /usr/share/application
-load-module module-augment-properties
-
-### Load audio drivers statically
-### (it's probably better to not load these drivers manually, but instead
-### use module-udev-detect -- see below -- for doing this automatically)
-#load-module module-alsa-sink device=hw:1,7
-#load-module module-alsa-sink
-#load-module module-alsa-source device=hw:1,0
-#load-module module-alsa-source device=hw:1,7
-#load-module module-null-sink
-#load-module module-pipe-sink
-
-### Automatically load driver modules depending on the hardware available
-.ifexists module-udev-detect.so
-load-module module-udev-detect
-.else
-### Use the static hardware detection module (for systems that lack udev/hal support)
-load-module module-detect
-.endif
-
-### Automatically connect sink and source if JACK server is present
-.ifexists module-jackdbus-detect.so
-load-module module-jackdbus-detect
-.endif
-
-
-### Load several protocols
-.ifexists module-esound-protocol-unix.so
-load-module module-esound-protocol-unix
-.endif
-load-module module-native-protocol-unix
-
-### Network access (may be configured with paprefs, so leave this commented
-### here if you plan to use paprefs)
-#load-module module-esound-protocol-tcp
-#load-module module-native-protocol-tcp
-#load-module module-zeroconf-publish
-
-### Load the RTP receiver module (also configured via paprefs, see above)
-#load-module module-rtp-recv
-
-### Load the RTP sender module (also configured via paprefs, see above)
-#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'"
-#load-module module-rtp-send source=rtp.monitor
-
-### Load additional modules from GConf settings. This can be configured with the paprefs tool.
-### Please keep in mind that the modules configured by paprefs might conflict with manually
-### loaded modules.
-.ifexists module-gconf.so
-.nofail
-load-module module-gconf
-.fail
-.endif
-
-### Automatically restore the default sink/source when changed by the user
-### during runtime
-### NOTE: This should be loaded as early as possible so that subsequent modules
-### that look up the default sink/source get the right value
-load-module module-default-device-restore
-
-### Automatically move streams to the default sink if the sink they are
-### connected to dies, similar for sources
-load-module module-rescue-streams
-
-### Make sure we always have a sink around, even if it is a null sink.
-load-module module-always-sink
-
-### Honour intended role device property
-load-module module-intended-roles
-
-### Automatically suspend sinks/sources that become idle for too long
-load-module module-suspend-on-idle
-
-### If autoexit on idle is enabled we want to make sure we only quit
-### when no local session needs us anymore.
-.ifexists module-console-kit.so
-load-module module-console-kit
-.endif
-
-### Enable positioned event sounds
-load-module module-position-event-sounds
-
-### Cork music streams when a phone stream is active
-load-module module-cork-music-on-phone
-
-### Modules to allow autoloading of filters (such as echo cancellation)
-### on demand. module-filter-heuristics tries to determine what filters
-### make sense, and module-filter-apply does the heavy-lifting of
-### loading modules and rerouting streams.
-load-module module-filter-heuristics
-load-module module-filter-apply
-
-### Load DBus protocol
-.ifexists module-dbus-protocol.so
-load-module module-dbus-protocol
-.endif
-
-# X11 modules should not be started from default.pa so that one daemon
-# can be shared by multiple sessions.
-
-### Load X11 bell module
-#load-module module-x11-bell sample=bell-windowing-system
-
-### Register ourselves in the X11 session manager
-load-module module-x11-xsmp
-
-### Publish connection data in the X11 root window
-.ifexists module-x11-publish.so
-.nofail
-load-module module-x11-publish
-.fail
-.endif
-
-### Make some devices default
-#set-default-sink output
-#set-default-source input

packages/audio/pulseaudio/config/pulse-default.conf

@@ -1,35 +0,0 @@
-# PulseAudio plugin configuration
-# $Id$
-
-# Let's create a virtual device "pulse" for mixer and PCM
-
-pcm.pulse {
-    type pulse
-    hint {
-        description "PulseAudio Sound Server"
-    }
-}
-
-ctl.pulse {
-    type pulse
-    hint {
-        description "PulseAudio Sound Server"
-    }
-}
-
-# Let's make it the default!
-
-pcm.!default {
-    type pulse
-    hint {
-        description "Default"
-    }
-}
-
-ctl.!default {
-    type pulse
-    hint {
-        description "Default"
-    }
-}
-

packages/audio/pulseaudio/config/system.pa

@@ -1,62 +0,0 @@
-#!/usr/bin/pulseaudio -nF
-#
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PulseAudio 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 Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-# This startup script is used only if PulseAudio is started in system
-# mode.
-
-### Automatically load driver modules depending on the hardware available
-.ifexists module-udev-detect.so
-load-module module-udev-detect
-.else
-### Use the static hardware detection module (for systems that lack udev/hal support)
-load-module module-detect
-.endif
-
-### Load several protocols
-.ifexists module-esound-protocol-unix.so
-load-module module-esound-protocol-unix
-.endif
-load-module module-native-protocol-unix
-
-### Automatically restore the volume of streams and devices
-load-module module-stream-restore
-load-module module-device-restore
-
-### Automatically restore the default sink/source when changed by the user
-### during runtime
-### NOTE: This should be loaded as early as possible so that subsequent modules
-### that look up the default sink/source get the right value
-load-module module-default-device-restore
-
-.ifexists module-dbus-protocol.so
-### If you want to allow TCP connections, set access to "remote" or "local,remote".
-load-module module-dbus-protocol access=local
-.endif
-
-### Automatically move streams to the default sink if the sink they are
-### connected to dies, similar for sources
-load-module module-rescue-streams
-
-### Make sure we always have a sink around, even if it is a null sink.
-load-module module-always-sink
-
-### Automatically suspend sinks/sources that become idle for too long
-load-module module-suspend-on-idle
-
-### Enable positioned event sounds
-load-module module-position-event-sounds

packages/audio/pulseaudio/init.d/91_PulseAudio

@@ -1,30 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-# start PulseAudio daemon
-#
-# runlevels: openelec, textmode
-
-progress "starting PulseAudio daemon"
-  pulseaudio --system --daemonize \
-             --log-target=file:/var/log/pulseaudio.log \
-             --log-level=debug >/dev/null 2>&1
-
-  export SDL_AUDIODRIVER=pulse

packages/audio/pulseaudio/package.mk

@@ -1,109 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="pulseaudio"
-PKG_VERSION="2.1"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://pulseaudio.org/"
-PKG_URL="http://freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl"
-PKG_BUILD_DEPENDS_TARGET="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl libcap"
-PKG_PRIORITY="optional"
-PKG_SECTION="audio"
-PKG_SHORTDESC="pulseaudio: Yet another sound server for Unix"
-PKG_LONGDESC="PulseAudio is a sound server for Linux and other Unix-like operating systems. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (esound or esd). In addition to the features esound provides, PulseAudio has an extensible plugin architecture, support for more than one sink per source, better low-latency behavior, the ability to be embedded into other software, a completely asynchronous C API, a simple command line interface for reconfiguring the daemon while running, flexible and implicit sample type conversion and resampling, and a "Zero-Copy" architecture."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
-
-# package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
-                           --disable-nls \
-                           --enable-largefile \
-                           --disable-rpath \
-                           --disable-x11 \
-                           --enable-samplerate \
-                           --disable-oss-output \
-                           --disable-oss-wrapper \
-                           --disable-coreaudio-output \
-                           --enable-alsa \
-                           --disable-esound \
-                           --disable-solaris \
-                           --disable-waveout \
-                           --disable-glib2 \
-                           --disable-gtk2 \
-                           --disable-gconf \
-                           --disable-jack \
-                           --disable-asyncns \
-                           --disable-tcpwrap \
-                           --disable-lirc \
-                           --enable-dbus \
-                           --disable-hal \
-                           --disable-bluez \
-                           --enable-udev \
-                           --disable-hal-compat \
-                           --enable-ipv6 \
-                           --enable-openssl \
-                           --disable-orc \
-                           --disable-manpages \
-                           --disable-per-user-esound-socket \
-                           --disable-legacy-runtime-dir \
-                           --disable-legacy-database-entry-format \
-                           --with-system-user=root \
-                           --with-system-group=root \
-                           --with-access-group=root \
-                           --with-module-dir=/usr/lib/pulse"
-
-if [ "$AVAHI_DAEMON" = yes ]; then
-  PKG_DEPENDS="$PKG_DEPENDS avahi"
-  PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET avahi"
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-avahi"
-else
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-avahi"
-fi
-
-pre_configure_target() {
-  # pulseaudio fails to build with LTO support
-    strip_lto
-}
-
-pre_make_target() {
-  MAKEFLAGS=-j1
-}
-
-post_makeinstall_target() {
-# add_user pulse x 499 498 "PulseAudio System Daemon" "/var/run/pulse" "/bin/sh"
-# add_group pulse 498
-# add_group pulse-access 497
-
-  sed -e 's%user="pulse"%user="root"%g' -i $INSTALL/etc/dbus-1/system.d/pulseaudio-system.conf
-
-  mkdir -p $INSTALL/etc
-    cp $PKG_DIR/config/asound.conf $INSTALL/etc
-
-  mkdir -p $INSTALL/etc/alsa
-    cp $PKG_DIR/config/pulse-default.conf $INSTALL/etc/alsa
-
-  rm -rf $INSTALL/usr/bin/esdcompat
-  rm -rf $INSTALL/usr/lib/cmake
-  rm -rf $INSTALL/usr/share/vala
-}

packages/audio/speex/package.mk

@@ -1,47 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="speex"
-PKG_VERSION="1.2rc1"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="BSD"
-PKG_SITE="http://www.speex.org"
-PKG_URL="http://downloads.xiph.org/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="libogg"
-PKG_BUILD_DEPENDS_TARGET="toolchain libogg"
-PKG_PRIORITY="optional"
-PKG_SECTION="audio"
-PKG_SHORTDESC="speex: A free Audio Codec optimized for speech"
-PKG_LONGDESC="Speex is a patent-free compression format designed especially for speech. It is specialized for voice communications at low bit-rates in the 2-45 kbps range. Possible applications include Voice over IP (VoIP), Internet audio streaming, audio books, and archiving of speech data (e.g. voice mail)."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="yes"
-
-# package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--with-ogg=$SYSROOT_PREFIX/usr \
-                           --enable-fixed-point \
-                           --disable-oggtest \
-                           --disable-float-api \
-                           --disable-vbr"
-
-post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
-}

packages/audio/speex/patches/speex-1.2rc1-001-remove_host_includes.patch

@@ -1,24 +0,0 @@
-diff -Naur speex-1.2rc1/libspeex/Makefile.am speex-1.2rc1.patch/libspeex/Makefile.am
---- speex-1.2rc1/libspeex/Makefile.am	2008-06-04 09:31:35.000000000 +0200
-+++ speex-1.2rc1.patch/libspeex/Makefile.am	2009-03-10 20:40:51.000000000 +0100
-@@ -4,7 +4,7 @@
- 
- EXTRA_DIST=echo_diagnostic.m
- 
--INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
-+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)
- 
- lib_LTLIBRARIES = libspeex.la libspeexdsp.la
- 
-diff -Naur speex-1.2rc1/libspeex/Makefile.in speex-1.2rc1.patch/libspeex/Makefile.in
---- speex-1.2rc1/libspeex/Makefile.in	2008-07-21 04:17:19.000000000 +0200
-+++ speex-1.2rc1.patch/libspeex/Makefile.in	2009-03-10 20:41:25.000000000 +0100
-@@ -277,7 +277,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- EXTRA_DIST = echo_diagnostic.m
--INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
-+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)
- lib_LTLIBRARIES = libspeex.la libspeexdsp.la
- 
- # Sources for compilation in the library

packages/audio/speex/patches/speex-1.2rc1-010_disable-utils.patch

@@ -1,12 +0,0 @@
-diff -Naur speex-1.2rc1/Makefile.in speex-1.2rc1a/Makefile.in
---- speex-1.2rc1/Makefile.in	2008-07-21 04:17:19.000000000 +0200
-+++ speex-1.2rc1a/Makefile.in	2010-05-18 14:31:25.229200674 +0200
-@@ -213,7 +213,7 @@
- EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP
- 
- #Fools KDevelop into including all files
--SUBDIRS = libspeex include @src@ doc win32 symbian ti
-+SUBDIRS = libspeex include doc win32 symbian ti
- DIST_SUBDIRS = libspeex include src doc win32 symbian ti
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

packages/audio/speex/patches/speex-automake-1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur speex-1.2rc1/configure.ac speex-1.2rc1.patch/configure.ac
---- speex-1.2rc1/configure.ac	2008-07-21 04:17:08.000000000 +0200
-+++ speex-1.2rc1.patch/configure.ac	2013-02-01 16:50:06.747570221 +0100
-@@ -2,7 +2,7 @@
- 
- AC_INIT(libspeex/speex.c)
- 
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- 
- SPEEX_MAJOR_VERSION=1
- SPEEX_MINOR_VERSION=1

packages/databases/mysql/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="mysql"
-PKG_VERSION="5.1.68"
+PKG_VERSION="5.1.70"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/databases/sqlite/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3071700"
+PKG_VERSION="autoconf-3080002"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"

packages/debug/gdb/package.mk

@@ -38,6 +38,11 @@ PKG_AUTORECONF="no"
 CC_FOR_BUILD="$HOST_CC"
 CFLAGS_FOR_BUILD="$HOST_CFLAGS"
 
+pre_configure_target() {
+  # gdb could fail on runtime if build with LTO support
+    strip_lto
+}
+
 PKG_CONFIGURE_OPTS_TARGET="bash_cv_have_mbstate_t=set \
                            --disable-shared \
                            --enable-static \

packages/debug/strace/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="strace"
-PKG_VERSION="4.7"
+PKG_VERSION="4.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

packages/debug/strace/patches/strace-4.7-automake_1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur strace-4.7-old/configure.ac strace-4.7-new/configure.ac
---- strace-4.7-old/configure.ac	2012-05-02 05:34:56.000000000 -0700
-+++ strace-4.7-new/configure.ac	2013-01-03 21:01:04.000000000 -0800
-@@ -3,7 +3,7 @@
- AC_INIT([strace],[4.7])
- AC_CONFIG_SRCDIR([strace.c])
- AC_CONFIG_AUX_DIR([.])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AM_INIT_AUTOMAKE([foreign check-news dist-xz no-dist-gzip silent-rules])
- AM_MAINTAINER_MODE
- AC_CANONICAL_HOST

packages/debug/strace/patches/strace-4.8-autoreconf.patch

@@ -0,0 +1,13 @@
+diff -Naur strace-4.8/configure.ac strace-4.8.patch/configure.ac
+--- strace-4.8/configure.ac	2013-05-04 21:51:57.000000000 +0200
++++ strace-4.8.patch/configure.ac	2013-09-04 03:30:12.478057723 +0200
+@@ -1,8 +1,6 @@
+ dnl Process this file with autoconf to create configure.  Use autoreconf.
+ AC_PREREQ(2.57)
+-AC_INIT([strace],
+-	m4_esyscmd([./git-version-gen .tarball-version]),
+-	[[email protected]])
++AC_INIT([strace],[4.8])
+ AC_CONFIG_SRCDIR([strace.c])
+ AC_CONFIG_AUX_DIR([.])
+ AC_CONFIG_HEADERS([config.h])

packages/devel/boost/build

@@ -25,6 +25,10 @@
 # boost fails building with LTO support
   strip_lto
 
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
 cd $PKG_BUILD
 sh bootstrap.sh \
      --prefix=/usr \
@@ -40,5 +44,7 @@ $ROOT/$TOOLCHAIN/bin/bjam -d2 --toolset=gcc link=static \
   --with-thread \
   --with-iostreams \
   --with-system \
+  --with-serialization \
+  --with-filesystem \
   --with-regex -sICU_PATH="$SYSROOT_PREFIX/usr" \
   install

packages/devel/dbus-glib-host/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://freedesktop.org/wiki/Software/dbus"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain glib-host dbus-host"
+PKG_BUILD_DEPENDS="toolchain glib-host dbus:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="dbus-glib: A message bus system"

packages/devel/glib-host/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache libffi-host zlib:host Python-host"
+PKG_BUILD_DEPENDS="ccache libffi-host libxml2-host zlib:host Python-host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="glib-host: C support library"

packages/devel/json-c/build

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

packages/devel/json-c/meta

@@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue ([email protected])
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="json-c"
-PKG_VERSION="0.9"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="MIT"
-PKG_SITE="http://oss.metaparadigm.com/json-c/"
-PKG_URL="http://oss.metaparadigm.com/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="devel"
-PKG_SHORTDESC="json-c: A JSON implementation in C"
-PKG_LONGDESC="JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="yes"

packages/devel/json-c/patches/json-c-automake-1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur json-c-0.9/configure.in json-c-0.9.patch/configure.in
---- json-c-0.9/configure.in	2009-01-06 23:55:33.000000000 +0100
-+++ json-c-0.9.patch/configure.in	2013-02-01 16:45:09.890830041 +0100
-@@ -10,7 +10,7 @@
- # Checks for libraries.
- 
- # Checks for header files.
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_HEADER_STDC
- AC_CHECK_HEADERS(fcntl.h limits.h strings.h syslog.h unistd.h [sys/param.h] stdarg.h)
- 

packages/devel/llvm/package.mk

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="llvm"
-PKG_VERSION="3.0"
+PKG_VERSION="3.3.src"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://llvm.org/"
-PKG_URL="http://llvm.org/releases/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://llvm.org/releases/3.3/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS_TARGET="toolchain llvm:host"
 PKG_BUILD_DEPENDS_HOST="toolchain"
@@ -37,24 +37,12 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 # package specific configure options
-PKG_CONFIGURE_OPTS_HOST="--enable-polly \
-                         --enable-optimized \
-                         --disable-profiling \
+PKG_CONFIGURE_OPTS_HOST="--disable-polly \
+                         --disable-zlib \
                          --disable-assertions \
-                         --disable-expensive-checks \
+                         --enable-optimized \
                          --disable-debug-runtime \
-                         --disable-debug-symbols \
-                         --enable-jit \
-                         --disable-docs \
-                         --disable-doxygen \
-                         --enable-threads \
-                         --enable-pthreads \
-                         --enable-pic \
-                         --enable-shared \
-                         --enable-embed-stdcxx \
-                         --enable-timestamps \
-                         --disable-libffi \
-                         --enable-ltdl-install"
+                         --disable-debug-symbols"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-polly \
                            --enable-optimized \
@@ -76,28 +64,42 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-polly \
                            --disable-ltdl-install"
 
 if [ "$TARGET_ARCH" = i386 ]; then
-  PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_HOST --enable-targets=x86"
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=x86"
 elif [ "$TARGET_ARCH" = x86_64 ]; then
-  PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_HOST --enable-targets=x86_64"
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=x86_64"
+elif [ "$TARGET_ARCH" = arm ]; then
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=arm"
 fi
 
-PKG_MAKE_OPTS_TARGET="LLVM_TBLGEN=$ROOT/$TOOLCHAIN/bin/llvm-tblgen"
-PKG_MAKEINSTALL_OPTS_TARGET="LLVM_TBLGEN=$ROOT/$TOOLCHAIN/bin/llvm-tblgen"
+PKG_MAKE_OPTS_HOST="BUILD_DIRS_ONLY=1 CFLAGS= CXXFLAGS="
 
 pre_configure_host() {
   ( cd ../autoconf
     aclocal  --force --verbose -I m4
     autoconf --force --verbose -I m4 -o ../configure
   )
+
+  ( cd ../projects/sample/autoconf
+    aclocal  --force --verbose -I m4
+    autoconf --force --verbose -I m4 -o ../configure
+  )
+
+  # we are building hosttools inside the target builddir
+    mkdir -p ../.$TARGET_NAME && cd ../.$TARGET_NAME/
+    rm -rf ../.$HOST_NAME
+    mkdir -p BuildTools && cd BuildTools
 }
 
 pre_configure_target() {
-  # llvm fails to build with LTO support
+# llvm fails to build with LTO support
     strip_lto
 }
 
+makeinstall_host() {
+# nothing to install here
+ :
+}
+
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
   rm -rf $INSTALL/usr/lib/BugpointPasses.so

packages/devel/llvm/patches/llvm-3.0-cross.patch

@@ -1,109 +0,0 @@
-diff -Naur llvm-3.0.src/autoconf/configure.ac llvm-3.0.src.patch/autoconf/configure.ac
---- llvm-3.0.src/autoconf/configure.ac	2011-10-16 04:52:56.000000000 +0200
-+++ llvm-3.0.src.patch/autoconf/configure.ac	2011-12-03 12:57:33.324415172 +0100
-@@ -393,6 +393,10 @@
-        AC_CHECK_PROG(BUILD_CXX, c++, c++, , , /usr/ucb/c++)
-      fi
-   fi
-+  AC_SUBST(BUILD_CPPFLAGS)
-+  AC_SUBST(BUILD_CFLAGS)
-+  AC_SUBST(BUILD_CXXFLAGS)
-+  AC_SUBST(BUILD_LDFLAGS)
- else
-   AC_SUBST(LLVM_CROSS_COMPILING, [0])
- fi
-diff -Naur llvm-3.0.src/autoconf/m4/build_exeext.m4 llvm-3.0.src.patch/autoconf/m4/build_exeext.m4
---- llvm-3.0.src/autoconf/m4/build_exeext.m4	2008-09-26 19:27:58.000000000 +0200
-+++ llvm-3.0.src.patch/autoconf/m4/build_exeext.m4	2011-12-03 12:57:33.327415229 +0100
-@@ -18,7 +18,7 @@
-      fi
-   fi
-   test -z "$BUILD_CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
--  ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
-+  ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
-   rm -f conftest*
-   echo 'int main () { return 0; }' > conftest.$ac_ext
-   ac_cv_build_exeext=
-diff -Naur llvm-3.0.src/Makefile llvm-3.0.src.patch/Makefile
---- llvm-3.0.src/Makefile	2011-10-08 02:27:38.000000000 +0200
-+++ llvm-3.0.src.patch/Makefile	2011-12-03 13:00:42.692055438 +0100
-@@ -104,38 +104,6 @@
-   DIRS := $(filter-out unittests, $(DIRS))
- endif
- 
--# If we're cross-compiling, build the build-hosted tools first
--ifeq ($(LLVM_CROSS_COMPILING),1)
--all:: cross-compile-build-tools
--
--clean::
--	$(Verb) rm -rf BuildTools
--
--cross-compile-build-tools:
--	$(Verb) if [ ! -f BuildTools/Makefile ]; then \
--          $(MKDIR) BuildTools; \
--	  cd BuildTools ; \
--	  unset CFLAGS ; \
--	  unset CXXFLAGS ; \
--	  $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
--		--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \
--	        --disable-polly ; \
--	  cd .. ; \
--	fi; \
--	(unset SDKROOT; \
--	 $(MAKE) -C BuildTools \
--	  BUILD_DIRS_ONLY=1 \
--	  UNIVERSAL= \
--	  ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \
--	  ENABLE_PROFILING=$(ENABLE_PROFILING) \
--	  ENABLE_COVERAGE=$(ENABLE_COVERAGE) \
--	  DISABLE_ASSERTIONS=$(DISABLE_ASSERTIONS) \
--	  ENABLE_EXPENSIVE_CHECKS=$(ENABLE_EXPENSIVE_CHECKS) \
--	  CFLAGS= \
--	  CXXFLAGS= \
--	) || exit 1;
--endif
--
- # Include the main makefile machinery.
- include $(LLVM_SRC_ROOT)/Makefile.rules
- 
-diff -Naur llvm-3.0.src/Makefile.config.in llvm-3.0.src.patch/Makefile.config.in
---- llvm-3.0.src/Makefile.config.in	2011-10-13 19:27:34.000000000 +0200
-+++ llvm-3.0.src.patch/Makefile.config.in	2011-12-03 12:57:33.962427436 +0100
-@@ -113,6 +113,10 @@
- # call if we're cross-compiling).
- BUILD_CC=@BUILD_CC@
- BUILD_CXX=@BUILD_CXX@
-+BUILD_CPPFLAGS=@BUILD_CPPFLAGS@
-+BUILD_CFLAGS=@BUILD_CFLAGS@
-+BUILD_CXXFLAGS=@BUILD_CXXFLAGS@
-+BUILD_LDFLAGS=@BUILD_LDFLAGS@
- 
- # Triple for configuring build tools when cross-compiling
- BUILD_TRIPLE=@build@
-diff -Naur llvm-3.0.src/Makefile.rules llvm-3.0.src.patch/Makefile.rules
---- llvm-3.0.src/Makefile.rules	2011-10-11 14:51:44.000000000 +0200
-+++ llvm-3.0.src.patch/Makefile.rules	2011-12-03 12:59:37.459801461 +0100
-@@ -641,18 +641,18 @@
- 
- ifeq ($(BUILD_COMPONENT), 1)
-   Compile.C     = $(Compile.Wrapper) \
--	          $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
-+	          $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) \
-                   $(TargetCommonOpts) $(CompileCommonOpts) -c
-   Compile.CXX   = $(Compile.Wrapper) \
--	          $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \
-+	          $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \
- 		  $(CPPFLAGS) \
-                   $(TargetCommonOpts) $(CompileCommonOpts) -c
-   Preprocess.CXX= $(Compile.Wrapper) \
--	          $(BUILD_CXX) $(CPP.Flags) $(CPPFLAGS) $(TargetCommonOpts) \
-+	          $(BUILD_CXX) $(CPP.Flags) $(BUILD_CPPFLAGS) $(TargetCommonOpts) \
-                   $(CompileCommonOpts) $(CXX.Flags) -E
-   Link          = $(Compile.Wrapper) \
--	          $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \
--		  $(LD.Flags) $(LDFLAGS) \
-+	          $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \
-+		  $(LD.Flags) $(BUILD_LDFLAGS) \
-                   $(TargetCommonOpts) $(CompileCommonOpts) $(Strip)
- else
-   Compile.C     = $(Compile.Wrapper) \

packages/devel/llvm/patches/llvm-3.3-cross.patch

@@ -0,0 +1,114 @@
+diff -Naur llvm-3.3.src/autoconf/configure.ac llvm-3.3.src.patch/autoconf/configure.ac
+--- llvm-3.3.src/autoconf/configure.ac	2013-05-20 22:18:23.000000000 +0200
++++ llvm-3.3.src.patch/autoconf/configure.ac	2013-09-24 07:20:25.485443916 +0200
+@@ -461,6 +461,10 @@
+        AC_CHECK_PROG(BUILD_CXX, c++, c++, , , /usr/ucb/c++)
+      fi
+   fi
++  AC_SUBST(BUILD_CPPFLAGS)
++  AC_SUBST(BUILD_CFLAGS)
++  AC_SUBST(BUILD_CXXFLAGS)
++  AC_SUBST(BUILD_LDFLAGS)
+ else
+   AC_SUBST(LLVM_CROSS_COMPILING, [0])
+ fi
+diff -Naur llvm-3.3.src/autoconf/m4/build_exeext.m4 llvm-3.3.src.patch/autoconf/m4/build_exeext.m4
+--- llvm-3.3.src/autoconf/m4/build_exeext.m4	2008-09-26 19:27:58.000000000 +0200
++++ llvm-3.3.src.patch/autoconf/m4/build_exeext.m4	2013-09-24 07:20:25.485443916 +0200
+@@ -18,7 +18,7 @@
+      fi
+   fi
+   test -z "$BUILD_CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
+-  ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
++  ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
+   rm -f conftest*
+   echo 'int main () { return 0; }' > conftest.$ac_ext
+   ac_cv_build_exeext=
+diff -Naur llvm-3.3.src/Makefile llvm-3.3.src.patch/Makefile
+--- llvm-3.3.src/Makefile	2013-01-28 04:19:57.000000000 +0100
++++ llvm-3.3.src.patch/Makefile	2013-09-24 07:21:27.489493235 +0200
+@@ -99,44 +99,6 @@
+   DIRS := $(filter-out unittests, $(DIRS))
+ endif
+ 
+-# If we're cross-compiling, build the build-hosted tools first
+-ifeq ($(LLVM_CROSS_COMPILING),1)
+-all:: cross-compile-build-tools
+-
+-clean::
+-	$(Verb) rm -rf BuildTools
+-
+-cross-compile-build-tools:
+-	$(Verb) if [ ! -f BuildTools/Makefile ]; then \
+-          $(MKDIR) BuildTools; \
+-	  cd BuildTools ; \
+-	  unset CFLAGS ; \
+-	  unset CXXFLAGS ; \
+-	  unset SDKROOT ; \
+-	  unset UNIVERSAL_SDK_PATH ; \
+-	  $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
+-		--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE) \
+-	        --disable-polly ; \
+-	  cd .. ; \
+-	fi; \
+-	($(MAKE) -C BuildTools \
+-	  BUILD_DIRS_ONLY=1 \
+-	  UNIVERSAL= \
+-	  UNIVERSAL_SDK_PATH= \
+-	  SDKROOT= \
+-	  TARGET_NATIVE_ARCH="$(TARGET_NATIVE_ARCH)" \
+-	  TARGETS_TO_BUILD="$(TARGETS_TO_BUILD)" \
+-	  ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \
+-	  ENABLE_PROFILING=$(ENABLE_PROFILING) \
+-	  ENABLE_COVERAGE=$(ENABLE_COVERAGE) \
+-	  DISABLE_ASSERTIONS=$(DISABLE_ASSERTIONS) \
+-	  ENABLE_EXPENSIVE_CHECKS=$(ENABLE_EXPENSIVE_CHECKS) \
+-	  ENABLE_LIBCPP=$(ENABLE_LIBCPP) \
+-	  CFLAGS= \
+-	  CXXFLAGS= \
+-	) || exit 1;
+-endif
+-
+ # Include the main makefile machinery.
+ include $(LLVM_SRC_ROOT)/Makefile.rules
+ 
+diff -Naur llvm-3.3.src/Makefile.config.in llvm-3.3.src.patch/Makefile.config.in
+--- llvm-3.3.src/Makefile.config.in	2013-04-23 10:28:39.000000000 +0200
++++ llvm-3.3.src.patch/Makefile.config.in	2013-09-24 07:20:25.487443917 +0200
+@@ -130,6 +130,10 @@
+ # call if we're cross-compiling).
+ BUILD_CC=@BUILD_CC@
+ BUILD_CXX=@BUILD_CXX@
++BUILD_CPPFLAGS=@BUILD_CPPFLAGS@
++BUILD_CFLAGS=@BUILD_CFLAGS@
++BUILD_CXXFLAGS=@BUILD_CXXFLAGS@
++BUILD_LDFLAGS=@BUILD_LDFLAGS@
+ 
+ # Triple for configuring build tools when cross-compiling
+ BUILD_TRIPLE=@build@
+diff -Naur llvm-3.3.src/projects/sample/autoconf/configure.ac llvm-3.3.src.patch/projects/sample/autoconf/configure.ac
+--- llvm-3.3.src/projects/sample/autoconf/configure.ac	2013-05-06 18:23:07.000000000 +0200
++++ llvm-3.3.src.patch/projects/sample/autoconf/configure.ac	2013-09-24 07:33:47.746272015 +0200
+@@ -345,6 +345,10 @@
+        AC_CHECK_PROG(BUILD_CXX, c++, c++, , , /usr/ucb/c++)
+      fi
+   fi
++  AC_SUBST(BUILD_CPPFLAGS)
++  AC_SUBST(BUILD_CFLAGS)
++  AC_SUBST(BUILD_CXXFLAGS)
++  AC_SUBST(BUILD_LDFLAGS)
+ else
+   AC_SUBST(LLVM_CROSS_COMPILING, [0])
+ fi
+diff -Naur llvm-3.3.src/projects/sample/autoconf/m4/build_exeext.m4 llvm-3.3.src.patch/projects/sample/autoconf/m4/build_exeext.m4
+--- llvm-3.3.src/projects/sample/autoconf/m4/build_exeext.m4	2011-10-19 01:10:47.000000000 +0200
++++ llvm-3.3.src.patch/projects/sample/autoconf/m4/build_exeext.m4	2013-09-24 07:32:18.332178706 +0200
+@@ -18,7 +18,7 @@
+      fi
+   fi
+   test -z "$BUILD_CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
+-  ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
++  ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
+   rm -f conftest*
+   echo 'int main () { return 0; }' > conftest.$ac_ext
+   ac_cv_build_exeext=