Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

Conflicts:
	packages/linux/meta
	packages/linux/patches/linux-3.2.27-071-silence_i915_agp-module-0.1.patch
	packages/linux/patches/linux-3.2.27-212-mantis_stb0899_faster_lock.patch
	packages/linux/patches/linux-3.2.28-071-silence_i915_agp-module-0.1.patch
	packages/linux/patches/linux-3.2.28-081-drm_cea_modes.patch
	packages/linux/patches/linux-3.2.28-201-add_Anysee_T2C_support-0.1.patch
	packages/linux/patches/linux-3.2.28-202-add_HVR930C_support-0.1.patch
	packages/linux/patches/linux-3.2.28-210-add_DVBSky_support.patch
	packages/linux/patches/linux-3.2.28-211-add_TeVii_s471_support.patch
	packages/linux/patches/linux-3.2.28-212-mantis_stb0899_faster_lock.patch
	packages/linux/patches/linux-3.2.28-213-cinergy_s2_usb_r2.patch
	packages/linux/patches/linux-3.2.28-251-acpi-5.0_support.patch
	packages/linux/patches/linux-3.2.28-920_add_rtl8168.patch
	packages/linux/patches/linux-3.2.28-990-xc5000_add_support_for_get_if_frequency.patch
	packages/linux/patches/linux-3.5.2-071-silence_i915_agp-module-0.1.patch
	packages/linux/patches/linux-3.5.2-212-mantis_stb0899_faster_lock.patch

packages/linux-drivers/linux-tbs-drivers/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="linux-tbs-drivers"
-PKG_VERSION="120709"
+PKG_VERSION="120814"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/linux/meta

@@ -21,7 +21,7 @@
 PKG_NAME="linux"
 PKG_VERSION="3.5.2"
 if [ "$LINUX" = "3.2" ]; then
-  PKG_VERSION="3.2.27"
+  PKG_VERSION="3.2.28"
 fi
 PKG_REV="1"
 PKG_ARCH="any"

packages/mediacenter/xbmc/install

@@ -64,6 +64,10 @@ rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.dxspectrum
 rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.itunes
 rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.milkdrop
 
+# remove broken addons
+  rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/metadata.*.allmusic.com
+  rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/metadata.yahoomusic.com
+
 # overriding Splash image
 mkdir -p $INSTALL/usr/share/xbmc/media
   rm -rf $INSTALL/usr/share/xbmc/media/Splash.png

packages/mediacenter/xbmc/patches/xbmc-11.0.1-902.12-linuxrenderer_delete_texture_targets_on_reconfigure.patch

@@ -0,0 +1,29 @@
+From 9687cc6b6f90fb40e39060eff9e4d8283254b770 Mon Sep 17 00:00:00 2001
+From: xbmc <fernetmenta@online.de>
+Date: Fri, 13 Jul 2012 18:57:37 +0200
+Subject: [PATCH] linuxrenderer: delete texture targets on reconfigure
+
+---
+ xbmc/cores/VideoRenderers/LinuxRendererGL.cpp |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+index 7c46cfd..85fc50c 100644
+--- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
++++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+@@ -261,6 +261,12 @@ bool CLinuxRendererGL::ValidateRenderTarget()
+     else
+       CLog::Log(LOGNOTICE,"Using GL_TEXTURE_2D");
+ 
++    // function pointer for texture might change in
++    // call to LoadShaders
++    glFinish();
++    for (int i = 0 ; i < m_NumYV12Buffers ; i++)
++      (this->*m_textureDelete)(i);
++
+      // create the yuv textures
+     LoadShaders();
+ 
+-- 
+1.7.10
+

packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-902.12-linuxrenderer_delete_texture_targets_on_reconfigure.patch

@@ -0,0 +1,29 @@
+From 9687cc6b6f90fb40e39060eff9e4d8283254b770 Mon Sep 17 00:00:00 2001
+From: xbmc <fernetmenta@online.de>
+Date: Fri, 13 Jul 2012 18:57:37 +0200
+Subject: [PATCH] linuxrenderer: delete texture targets on reconfigure
+
+---
+ xbmc/cores/VideoRenderers/LinuxRendererGL.cpp |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+index 7c46cfd..85fc50c 100644
+--- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
++++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+@@ -261,6 +261,12 @@ bool CLinuxRendererGL::ValidateRenderTarget()
+     else
+       CLog::Log(LOGNOTICE,"Using GL_TEXTURE_2D");
+ 
++    // function pointer for texture might change in
++    // call to LoadShaders
++    glFinish();
++    for (int i = 0 ; i < m_NumYV12Buffers ; i++)
++      (this->*m_textureDelete)(i);
++
+      // create the yuv textures
+     LoadShaders();
+ 
+-- 
+1.7.10
+

packages/network/openssh/build

@@ -26,13 +26,13 @@ export LD="$TARGET_CC"
 export LDFLAGS="$TARGET_CFLAGS $TARGET_LDFLAGS"
 
 cd $PKG_BUILD
-#ac_cv_have_space_for_dirent_d_name=yes \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
             --disable-strip \
             --disable-lastlog \
+            --with-sandbox=rlimit \
             --disable-utmp \
             --disable-utmpx \
             --disable-wtmp \

packages/x11/driver/xf86-video-fglrx-legacy/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="xf86-video-fglrx-legacy"
-PKG_VERSION="12.6.final"
+PKG_VERSION="12.6"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.ati.com/"
-PKG_URL="$DISTRO_SRC/amd-driver-installer-$PKG_VERSION-legacy-x86.x86_64.run"
+PKG_URL="http://www2.ati.com/drivers/legacy/`echo $PKG_VERSION | sed 's/\./-/'`/amd-driver-installer-${PKG_VERSION}-legacy-x86.x86_64.zip"
 PKG_DEPENDS="linux libX11 libXinerama libXcomposite"
 PKG_BUILD_DEPENDS="toolchain util-macros libX11 libXinerama libXcomposite linux"
 PKG_PRIORITY="optional"

packages/x11/driver/xf86-video-fglrx-legacy/unpack

@@ -24,10 +24,13 @@
 
 require_eglibc $1
 
-ATI_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
+ZIP_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
 [ -d $PKG_BUILD ] && rm -rf $PKG_BUILD
 
-sh $SOURCES/$1/$ATI_PKG --extract $BUILD/$PKG_NAME-$PKG_VERSION
+mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
+  unzip $SOURCES/$1/$ZIP_PKG -d $BUILD/${PKG_NAME}-${PKG_VERSION} >/dev/null 2>&1
+  ATI_PKG=`ls -d $BUILD/${PKG_NAME}-${PKG_VERSION}/amd-driver-installer-*.run`
+  sh $ATI_PKG --extract $BUILD/$PKG_NAME-$PKG_VERSION
 
 echo "### Applying upstream patches ###"
 

packages/x11/driver/xf86-video-fglrx/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="xf86-video-fglrx"
-PKG_VERSION="12.6"
+PKG_VERSION="12.8"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.ati.com/"
-PKG_URL="http://www2.ati.com/drivers/linux/amd-driver-installer-`echo $PKG_VERSION | sed 's/\./-/'`-x86.x86_64.run"
+PKG_URL="http://www2.ati.com/drivers/linux/amd-driver-installer-`echo $PKG_VERSION | sed 's/\./-/'`-x86.x86_64.zip"
 PKG_DEPENDS="linux libX11 libXinerama libXcomposite"
 PKG_BUILD_DEPENDS="toolchain util-macros libX11 libXinerama libXcomposite linux"
 PKG_PRIORITY="optional"

packages/x11/driver/xf86-video-fglrx/unpack

@@ -24,10 +24,13 @@
 
 require_eglibc $1
 
-ATI_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
+ZIP_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
 [ -d $PKG_BUILD ] && rm -rf $PKG_BUILD
 
-sh $SOURCES/$1/$ATI_PKG --extract $BUILD/$PKG_NAME-$PKG_VERSION
+mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
+  unzip $SOURCES/$1/$ZIP_PKG -d $BUILD/${PKG_NAME}-${PKG_VERSION} >/dev/null 2>&1
+  ATI_PKG=`ls -d $BUILD/${PKG_NAME}-${PKG_VERSION}/amd-driver-installer-*.run`
+  sh $ATI_PKG --extract $BUILD/$PKG_NAME-$PKG_VERSION
 
 echo "### Applying upstream patches ###"
 

packages/x11/driver/xf86-video-intel/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xf86-video-intel"
-PKG_VERSION="2.20.3"
+PKG_VERSION="2.20.4"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"