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.
...

Makefile

@@ -8,6 +8,9 @@ system:
 release:
 	./scripts/image release
 
+image:
+	BUILD_IMAGE=yes ./scripts/image release
+
 noobs:
 	./scripts/image noobs
 

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
 
@@ -346,7 +361,6 @@ if [ "$BOOTLOADER" = "u-boot" ]; then
 fi
   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 - UPower support:\t\t\t $UPOWER"
   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,18 +36,6 @@ 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"
@@ -95,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/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/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/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-dvbapi"
-PKG_VERSION="555272d"
+PKG_VERSION="2be5e15"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

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/service/multimedia/boblightd/changelog.txt

@@ -1,3 +1,6 @@
+3.1.3
+- update to boblightd-474
+
 3.1.2
 - rebuild
 

packages/addons/service/multimedia/boblightd/meta

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

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/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/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=

packages/graphics/Mesa/package.mk

@@ -19,12 +19,13 @@
 ################################################################################
 
 PKG_NAME="Mesa"
-PKG_VERSION="9.2.0"
+PKG_VERSION="cfbfb50"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
-PKG_URL="ftp://freedesktop.org/pub/mesa/9.2/MesaLib-$PKG_VERSION.tar.bz2"
+# PKG_URL="ftp://freedesktop.org/pub/mesa/9.2/MesaLib-$PKG_VERSION.tar.bz2"
+PKG_URL="$DISTRO_SRC/Mesa-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libX11"
 PKG_BUILD_DEPENDS_TARGET="toolchain Python-host makedepend:host libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
 PKG_PRIORITY="optional"
@@ -41,13 +42,13 @@ PKG_AUTORECONF="yes"
 if [ "$LLVM_SUPPORT" = "yes" ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET llvm"
   PKG_DEPENDS="$PKG_DEPENDS llvm"
-  export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
+  export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config-host"
   MESA_GALLIUM_LLVM="--enable-gallium-llvm --with-llvm-shared-libs"
 else
   MESA_GALLIUM_LLVM="--disable-gallium-llvm"
 fi
 
-if [ "$MESA_VDPAU_SUPPORT" = "yes" ]; then
+if [ "$VDPAU" = "yes" ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libvdpau"
   PKG_DEPENDS="$PKG_DEPENDS libvdpau"
   MESA_VDPAU="--enable-vdpau"

packages/graphics/Mesa/patches/Mesa-002-compile-fix.patch

@@ -0,0 +1,29 @@
+commit d8fcfd06c417daee69335ff867d72c23b87f5fc3
+Author: fritsch <[email protected]>
+Date:   Thu Oct 3 08:50:50 2013 +0200
+
+    Fix compilation of glinterop after e9b410b54dd893568a50af661fdbba12b4573ed9
+
+diff --git a/src/mesa/state_tracker/st_vdpau.c b/src/mesa/state_tracker/st_vdpau.c
+index 406df0f..9b165ee 100644
+--- a/src/mesa/state_tracker/st_vdpau.c
++++ b/src/mesa/state_tracker/st_vdpau.c
+@@ -154,7 +154,7 @@ st_vdpau_map_surface(struct gl_context *ctx, GLenum target, GLenum access,
+    stObj->depth0 = 1;
+    stObj->surface_format = res->format;
+ 
+-   _mesa_dirty_texobj(ctx, texObj, GL_TRUE);
++   _mesa_dirty_texobj(ctx, texObj);
+ }
+ 
+ static void
+@@ -170,7 +170,7 @@ st_vdpau_unmap_surface(struct gl_context *ctx, GLenum target, GLenum access,
+    pipe_sampler_view_reference(&stObj->sampler_view, NULL);
+    pipe_resource_reference(&stImage->pt, NULL);
+ 
+-   _mesa_dirty_texobj(ctx, texObj, GL_TRUE);
++   _mesa_dirty_texobj(ctx, texObj);
+ }
+ 
+ void
+

packages/graphics/bcm2835-driver/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="7d8a762"
+PKG_VERSION="b4e35f4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
@@ -76,3 +76,8 @@ makeinstall_target() {
   mkdir -p $INSTALL/opt/vc
     ln -sf /usr/lib $INSTALL/opt/vc/lib
 }
+
+post_install() {
+  enable_service fbset.timer
+  enable_service unbind-console.service
+}

packages/graphics/bcm2835-driver/profile.d/display.conf

@@ -1,32 +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
-################################################################################
-# This file contains non-OpenELEC evironment variables as well as OpenELEC
-# evironment variables that are not user defined.
-################################################################################
-
-################################################################################
-# setup functions
-################################################################################
-
-# stub function
-  wait_for_xorg () {
-    echo 0 > /sys/class/vtconsole/vtcon1/bind
-    fbset -g 1 1 1 1 32
-  }

packages/graphics/bcm2835-driver/system.d/fbset.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Framebuffer setup
+After=multi-user.target
+
+[Service]
+Type=oneshot
+ExecStart=/sbin/fbset -g 1 1 1 1 32
+
+[Install]
+WantedBy=graphical.target

packages/graphics/bcm2835-driver/system.d/fbset.timer

@@ -0,0 +1,8 @@
+[Unit]
+Description=Framebuffer setup
+
+[Timer]
+OnBootSec=20sec
+
+[Install]
+WantedBy=graphical.target

packages/graphics/bcm2835-driver/system.d/unbind-console.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=unbind Framebuffer console
+
+ConditionPathExists=/sys/class/vtconsole/vtcon1/bind
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c 'echo 0 > /sys/class/vtconsole/vtcon1/bind'
+
+[Install]
+WantedBy=graphical.target

packages/initramfs/compress/zlib-initramfs/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="zlib-initramfs"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.zlib.net"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain zlib"
-PKG_PRIORITY="optional"
-PKG_SECTION="initramfs/compress"
-PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library"
-PKG_LONGDESC="zlib is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format)."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/initramfs/linux-initramfs/install

@@ -38,3 +38,4 @@ if [ -n "$INITRAMFS_MODULES" ]; then
     fi
   done
 fi
+

packages/initramfs/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="eglibc-initramfs busybox-initramfs linux-initramfs plymouth-lite diskdev_cmds-initramfs dosfstools-initramfs e2fsprogs-initramfs"
+PKG_DEPENDS="eglibc-initramfs busybox-initramfs linux-initramfs diskdev_cmds-initramfs"
 PKG_BUILD_DEPENDS="toolchain eglibc-initramfs busybox-initramfs"
 PKG_PRIORITY="optional"
 PKG_SECTION="initramfs"

packages/initramfs/sysutils/busybox-initramfs/scripts/init

@@ -72,10 +72,21 @@
         ;;
       boot=*)
         boot="${arg#*=}"
+        case $boot in
+          CIFS=*|SMB=*|ISCSI=*|NBD=*|NFS=*)
+            UPDATE_DISABLED=yes
+            ;;
+        esac
         ;;
       disk=*)
         disk="${arg#*=}"
         ;;
+      textmode)
+        INIT_ARGS="$INIT_ARGS --unit=textmode.target"
+        ;;
+      installer)
+        INIT_ARGS="$INIT_ARGS --unit=installer.target"
+        ;;
       debugging)
         DEBUG=yes
         ;;
@@ -87,9 +98,7 @@
         ;;
       progress)
         PROGRESS=yes
-        ;;
-      nosplash)
-        SPLASH=no
+        INIT_ARGS="$INIT_ARGS --show-status=1"
         ;;
       noram)
         SYSTEM_TORAM=no
@@ -270,10 +279,6 @@
       LABEL=*|UUID=*|/*)
         MOUNT_CMD="mount_common"
         MOUNT_TARGET="$1"
-        # check filesystem
-          if [ -x /sbin/fsck ]; then
-            /sbin/fsck -a $1 &>/dev/null
-          fi
         ;;
       CIFS=*|SMB=*)
         MOUNT_CMD="mount_cifs"
@@ -325,6 +330,23 @@
     umount /sysroot
   }
 
+  hfsdiskprep() {
+    for DEVICE in /dev/sd*; do
+      for device in $(/bin/busybox blkid $DEVICE); do
+        case $device in
+          TYPE=*)
+            FS_TYPE=${device#TYPE=}
+            ;;
+        esac
+      done
+
+      if [ "$FS_TYPE" = "\"hfs\"" -o "$FS_TYPE" = "\"hfsplus\"" ]; then
+        progress "check filesystem $DEVICE [$FS_TYPE]..."
+        /bin/fsck_hfs -r -y $DEVICE >&$SILENT_OUT 2>&1
+      fi
+    done
+  }
+
   load_modules() {
     progress "Loading kernel modules"
 
@@ -336,26 +358,12 @@
     done
   }
 
-  load_splash() {
-    progress "Loading bootsplash"
+  check_disks() {
+    progress "Checking disks"
 
-    if [ -e /dev/fb0 -a ! "$SPLASH" = "no" ]; then
-
-      # set framebuffer to a default resolution (1024x768-32)
-        if [ ! "$SWITCH_FRAMEBUFFER" = "no" ]; then
-          fbset -g 1024 768 1024 768 32
-        fi
-
-      # load splash
-        if [ -f /flash/oemsplash.png ]; then
-          SPLASHIMAGE="/flash/oemsplash.png"
-        elif [ -f /splash/splash.conf ]; then
-          . /splash/splash.conf
-        else
-          SPLASHIMAGE="/splash/splash.png"
-        fi
-
-        ply-image $SPLASHIMAGE > /dev/null 2>&1
+    if [ -x /bin/fsck_hfs ]; then
+    # deal with hfs partitions
+      hfsdiskprep
     fi
   }
 
@@ -448,6 +456,13 @@
       fi
 
     if [ -f "$UPDATE_DIR/$UPDATE_KERNEL" -a -f "$UPDATE_DIR/$UPDATE_SYSTEM" ] ; then
+      if [ "$UPDATE_DISABLED" = "yes" ] ; then
+        rm -rf $UPDATE_DIR/[0-9a-zA-Z]* &>/dev/null
+        echo "Updating not supported on netboot. normal startup in 10s..."
+        sync
+        usleep 10000000
+        return 0
+      fi
       if [ -f "$UPDATE_DIR/.nocheck" ] ; then
         MD5_NOCHECK="1"
       fi
@@ -534,7 +549,7 @@
       mount --move /storage /sysroot/storage
     fi
 
-    [ -f "/sysroot/sbin/init" ] || error "final_check" "Could not find system."
+    [ -f "/sysroot/lib/systemd/systemd" ] || error "final_check" "Could not find system."
   }
 
   if [ "${boot%%=*}" = "FILE" ]; then
@@ -544,8 +559,8 @@
 # main boot sequence
   for BOOT_STEP in \
       load_modules \
+      check_disks \
       mount_flash \
-      load_splash \
       mount_storage \
       check_update \
       prepare_sysroot; do
@@ -560,7 +575,11 @@
   /bin/busybox mount --move /proc /sysroot/proc
   /bin/busybox mount --move /sys /sysroot/sys
 
+# tell OE settings addon to disable updates
+  if [ "$UPDATE_DISABLED" = "yes" ] ; then
+    echo "" > /sysroot/dev/.update_disabled
+  fi
 # switch to new sysroot and start real init
-  exec /bin/busybox switch_root /sysroot /sbin/init
+  exec /bin/busybox switch_root /sysroot /lib/systemd/systemd $INIT_ARGS
 
   error "switch_root" "Error in initramfs. Could not switch to new root"

packages/initramfs/sysutils/diskdev_cmds-initramfs/install

@@ -24,7 +24,5 @@
 
 DISKDEV_CMDS_DIR="$BUILD/diskdev_cmds-*"
 
-mkdir -p $INSTALL/sbin
-  cp $DISKDEV_CMDS_DIR/fsck_hfs.tproj/fsck_hfs $INSTALL/sbin
-    ln -sf fsck_hfs $INSTALL/sbin/fsck.hfs
-    ln -sf fsck_hfs $INSTALL/sbin/fsck.hfsplus
+mkdir -p $INSTALL/bin
+  cp $DISKDEV_CMDS_DIR/fsck_hfs.tproj/fsck_hfs $INSTALL/bin

packages/initramfs/sysutils/dosfstools-initramfs/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="dosfstools-initramfs"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://daniel-baumann.ch/software/dosfstools/"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain dosfstools"
-PKG_PRIORITY="optional"
-PKG_SECTION="tools"
-PKG_SHORTDESC="dosfstools: utilities for making and checking MS-DOS FAT filesystems."
-PKG_LONGDESC="dosfstools contains utilities for making and checking MS-DOS FAT filesystems."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/initramfs/sysutils/e2fsprogs-initramfs/install

@@ -1,38 +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
-
-E2FSPROGS_DIR="$BUILD/e2fsprogs-*"
-
-mkdir -p $INSTALL/sbin
-  cp $E2FSPROGS_DIR/e2fsck/e2fsck $INSTALL/sbin
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext2
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext3
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext4
-    ln -sf e2fsck $INSTALL/sbin/fsck.ext4dev
-  cp $E2FSPROGS_DIR/misc/mke2fs $INSTALL/sbin
-    ln -sf mke2fs $INSTALL/sbin/mkfs.ext2
-    ln -sf mke2fs $INSTALL/sbin/mkfs.ext3
-    ln -sf mke2fs $INSTALL/sbin/mkfs.ext4
-    ln -sf mke2fs $INSTALL/sbin/mkfs.ext4dev
-  cp $E2FSPROGS_DIR/misc/fsck $INSTALL/sbin

packages/initramfs/sysutils/e2fsprogs-initramfs/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="e2fsprogs-initramfs"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://e2fsprogs.sourceforge.net/"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain e2fsprogs"
-PKG_PRIORITY="optional"
-PKG_SECTION="tools"
-PKG_SHORTDESC="e2fsprogs: Utilities for use with the ext2 filesystem"
-PKG_LONGDESC="The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs, dumpe2fs, fsck, and others."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/initramfs/sysutils/v86d/install

@@ -1,26 +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
-
-mkdir -p $INSTALL/sbin
-  cp -P $PKG_BUILD/v86d $INSTALL/sbin

packages/initramfs/sysutils/v86d/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="v86d"
-PKG_VERSION="0.1.10"
-PKG_REV="1"
-PKG_ARCH="i386 x86_64"
-PKG_LICENSE="GPL"
-PKG_SITE="http://dev.gentoo.org/~spock/projects/uvesafb/"
-PKG_URL="http://dev.gentoo.org/~spock/projects/uvesafb/archive/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="system"
-PKG_SHORTDESC="v86d: A userspace helper that runs x86 code in an emulated environment."
-PKG_LONGDESC="v86d is the userspace helper that runs x86 code in an emulated environment. uvesafb will not work without v86d. v86d currently supports the x86 and amd64 (x86-64) architectures."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/initramfs/sysutils/v86d/patches/v86d-0.1.10-crosscompiling.patch

@@ -1,12 +0,0 @@
-diff -Naur v86d-0.1.10/libs/x86emu/Makefile v86d-0.1.10.patch/libs/x86emu/Makefile
---- v86d-0.1.10/libs/x86emu/Makefile	2011-02-25 22:27:39.000000000 +0100
-+++ v86d-0.1.10.patch/libs/x86emu/Makefile	2012-06-28 20:15:36.486234182 +0200
-@@ -1,7 +1,7 @@
- OBJS = decode.o fpu.o ops.o ops2.o prim_ops.o sys.o
- 
- libx86emu.a: $(OBJS)
--	ar rv $@ $+
-+	$(AR) rv $@ $+
- 
- %.o: %.c
- 	$(CC) -c $(CFLAGS) -o $@ $<

packages/initramfs/sysutils/v86d/patches/v86d-0.1.10-dont-include-kernelheaders.patch

@@ -1,18 +0,0 @@
-diff -Naur v86d-0.1.10/Makefile v86d-0.1.10.patch/Makefile
---- v86d-0.1.10/Makefile	2011-02-25 22:27:39.000000000 +0100
-+++ v86d-0.1.10.patch/Makefile	2013-01-14 19:20:13.385465794 +0100
-@@ -3,14 +3,12 @@
- .PHONY: clean install install_testvbe x86emu lrmi
- 
- INSTALL = install
--KDIR   ?= /lib/modules/$(shell uname -r)/source
- 
- ifeq ($(call config_opt,CONFIG_KLIBC),true)
- 	export CC = klcc
- endif
- 
- CFLAGS ?= -Wall -g -O2
--CFLAGS += -I$(KDIR)/include
- 
- ifeq ($(call config_opt,CONFIG_X86EMU),true)
- 	CFLAGS += -Ilibs/x86emu

packages/linux-drivers/vboxguest/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vboxguest"
-PKG_VERSION="4.2.12"
+PKG_VERSION="4.2.16"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux-firmware/misc-firmware/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="misc-firmware"
-PKG_VERSION="0.0.3"
+PKG_VERSION="0.0.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"

packages/linux-firmware/wlan-firmware/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="wlan-firmware"
-PKG_VERSION="0.0.13"
+PKG_VERSION="0.0.14"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"

packages/linux/config/modules

@@ -1,4 +0,0 @@
-# /etc/modules: force some kernel modules to be loaded at boot time.
-#
-# This file contains the names of kernel modules that should be loaded
-# at boot time, one per line. Lines beginning with "#" are ignored.