Merge remote-tracking branch 'upstream/master' into openelec-settings

packages/addons/service/multimedia/tvheadend/build

@@ -36,6 +36,7 @@ cd $PKG_BUILD
             --cc=$TARGET_CC \
             --enable-timeshift \
             --disable-libav \
+            --disable-avahi \
             --enable-bundle
 
 make

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

@@ -1,3 +1,7 @@
+3.0.6
+- update to TVHeadend 3.3.491
+- disable avahi support
+
 3.0.5
 - update to TVHeadend 3.3.485
 

packages/addons/service/multimedia/tvheadend/meta

@@ -19,15 +19,15 @@
 ################################################################################
 
 PKG_NAME="tvheadend"
-PKG_VERSION="3.3.485"
+PKG_VERSION="3.3.491"
-PKG_REV="5"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
 #PKG_URL="https://github.com/downloads/tvheadend/tvheadend/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS="$ICONV avahi openssl curl"
+PKG_DEPENDS="$ICONV openssl curl"
-PKG_BUILD_DEPENDS="toolchain $ICONV avahi openssl curl"
+PKG_BUILD_DEPENDS="toolchain $ICONV openssl curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/multimedia"
 PKG_SHORTDESC="tvheadend (Version: $PKG_VERSION): a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources."

packages/devel/libcec/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libcec"
-PKG_VERSION="2.1.0"
+PKG_VERSION="2.1.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/initramfs/sysutils/busybox-initramfs/config/busybox-initramfs.conf

@@ -997,7 +997,7 @@ CONFIG_FEATURE_BASH_IS_ASH=y
 # CONFIG_FEATURE_BASH_IS_HUSH is not set
 # CONFIG_FEATURE_BASH_IS_NONE is not set
 CONFIG_SH_MATH_SUPPORT=y
-# CONFIG_SH_MATH_SUPPORT_64 is not set
+CONFIG_SH_MATH_SUPPORT_64=y
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 CONFIG_FEATURE_SH_STANDALONE=y
 # CONFIG_FEATURE_SH_NOFORK is not set

packages/mediacenter/xbmc/patches/xbmc-990.28-PR2395.patch

@@ -0,0 +1,31 @@
+From 7a9939f714bcafe8d6616bfbdeb87d2e4b1f24e8 Mon Sep 17 00:00:00 2001
+From: pitpompej <pitpompej@arcor.de>
+Date: Fri, 8 Mar 2013 21:05:31 +0100
+Subject: [PATCH] Prevent timeout error because of waiting for port settings
+ change event on the wrong pipeline object when using
+ deinterlace mode
+
+---
+ xbmc/cores/omxplayer/OMXVideo.cpp |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp
+index d4b8fbf..15bc8fa 100644
+--- a/xbmc/cores/omxplayer/OMXVideo.cpp
++++ b/xbmc/cores/omxplayer/OMXVideo.cpp
+@@ -885,10 +885,10 @@ int COMXVideo::Decode(uint8_t *pData, int iSize, double dts, double pts)
+           {
+             CLog::Log(LOGERROR, "%s::%s - error m_omx_image_fx.SetParameter(OMX_IndexParamPortDefinition) omx_err(0x%08x)\n", CLASSNAME, __func__, omx_err);
+           }
+-          omx_err = m_omx_decoder.WaitForEvent(OMX_EventPortSettingsChanged);
++          omx_err = m_omx_image_fx.WaitForEvent(OMX_EventPortSettingsChanged);
+           if(omx_err != OMX_ErrorNone)
+           {
+-             CLog::Log(LOGERROR, "%s::%s - error m_omx_decoder.WaitForEvent(OMX_EventPortSettingsChanged) omx_err(0x%08x)\n", CLASSNAME, __func__, omx_err);
++             CLog::Log(LOGERROR, "%s::%s - error m_omx_image_fx.WaitForEvent(OMX_EventPortSettingsChanged) omx_err(0x%08x)\n", CLASSNAME, __func__, omx_err);
+           }
+           port_image.nPortIndex = m_omx_image_fx.GetOutputPort();
+           omx_err = m_omx_image_fx.GetParameter(OMX_IndexParamPortDefinition, &port_image);
+-- 
+1.7.10
+

packages/mediacenter/xbmc/unpack

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-echo "### Applying architecture based patches ###"
-
-if [ ! $TARGET_ARCH = arm ]; then
-  for patch in `ls $PKG_DIR/patches.x86`; do
-    cat $PKG_DIR/patches.x86/$patch | patch -d \
-      `echo $PKG_BUILD | cut -f1 -d\ ` -p1
-  done
-fi

packages/network/rpcbind/init.d/22_rpcbind

@@ -23,4 +23,4 @@
 # runlevels: openelec, textmode
 
 progress "start rpcbind daemon"
-  rpcbind
+  rpcbind > /dev/null 2>&1 &

packages/sysutils/bash/profile.d/shell.conf

@@ -23,7 +23,7 @@
 # evironment variables that are not user defined.
 ################################################################################
 
-PS1='\[\e[0;32m\]\u\[\e[m\] \[\e[1;34m\]\w\[\e[m\] \[\e[1;32m\]\$\[\e[m\] '
+PS1="\[\033]0;\h: \w\007\]\[\e[1;32m\]\h\[\e[1;32m\]:\[\e[1;34m\]\w \[\e[0m\]\\$ "
 export PS1
 
 case "$TERM" in
@@ -43,4 +43,4 @@ case "$TERM" in
         ;;
 
 esac
-export TERM
+export TERM

packages/sysutils/busybox/init.d/23_syslogd

@@ -30,10 +30,10 @@
     source /storage/.cache/syslog/remote
   fi
 
-  SYSLOGD_OPTIONS="-L"
+  SYSLOGD_OPTIONS="-L -D"
 
   if [ "$SYSLOG_REMOTE" == "true" -a "$SYSLOG_SERVER" ]; then
-    SYSLOGD_OPTIONS="$SYSLOGD_OPTIONS -R $SYSLOG_SERVER"
+    SYSLOGD_OPTIONS="-R $SYSLOG_SERVER $SYSLOGD_OPTIONS"
   fi
 
   if [ -f /storage/.config/syslog.conf ]; then

packages/toolchain/devel/eglibc/build

@@ -142,7 +142,7 @@ EOF
              --without-gd \
              --enable-obsolete-rpc \
              --disable-build-nscd \
-             --disable-nscd \
+             --disable-nscd \
              $DEBUG_CONFIG \
 
 make

projects/RPi/xbmc/advancedsettings.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
-  <cputempcommand>cputemp</cputempcommand>
-  <gputempcommand>cputemp</gputempcommand>
   <showexitbutton>false</showexitbutton>
 
   <destroywindowcontrols>false</destroywindowcontrols>
@@ -21,7 +19,7 @@
   </audio>
 
   <network>
-    <cachemembuffersize>5282880</cachemembuffersize>
+    <cachemembuffersize>2097152</cachemembuffersize>
   </network>
 
   <samba>