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

packages/devel/libffi/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libffi"
-PKG_VERSION="3.0.11"
+PKG_VERSION="3.0.13"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/graphics/bcm2835-driver/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="98e5704"
+PKG_VERSION="2bcb2bc"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/linux-drivers/RTL8192CU/patches/RTL8192CU-add_device_ID_330d.patch

@@ -0,0 +1,23 @@
+diff -Naur RTL8192CU-v3.4.4_4749.20121105/hal/rtl8192c/usb/usb_halinit.c RTL8192CU-v3.4.4_4749.20121105.patch/hal/rtl8192c/usb/usb_halinit.c
+--- RTL8192CU-v3.4.4_4749.20121105/hal/rtl8192c/usb/usb_halinit.c	2012-07-30 14:51:05.000000000 +0200
++++ RTL8192CU-v3.4.4_4749.20121105.patch/hal/rtl8192c/usb/usb_halinit.c	2013-03-19 16:51:48.251080509 +0100
+@@ -3786,6 +3786,8 @@
+ 				pHalData->CustomerID = RT_CID_DLINK;
+ 			else if((pHalData->EEPROMVID == 0x2001) && (pHalData->EEPROMPID == 0x330a))
+ 				pHalData->CustomerID = RT_CID_DLINK;
++			else if((pHalData->EEPROMVID == 0x2001) && (pHalData->EEPROMPID == 0x330d))
++				pHalData->CustomerID = RT_CID_DLINK;
+ 			break;
+ 		case EEPROM_CID_WHQL:
+ /*			
+diff -Naur RTL8192CU-v3.4.4_4749.20121105/os_dep/linux/usb_intf.c RTL8192CU-v3.4.4_4749.20121105.patch/os_dep/linux/usb_intf.c
+--- RTL8192CU-v3.4.4_4749.20121105/os_dep/linux/usb_intf.c	2012-07-30 14:51:05.000000000 +0200
++++ RTL8192CU-v3.4.4_4749.20121105.patch/os_dep/linux/usb_intf.c	2013-03-19 16:52:54.174644642 +0100
+@@ -137,6 +137,7 @@
+ 	{USB_DEVICE(0x2001, 0x3307)},//D-Link - Cameo
+ 	{USB_DEVICE(0x2001, 0x330A)},//D-Link - Alpha
+ 	{USB_DEVICE(0x2001, 0x3309)},//D-Link - Alpha
++	{USB_DEVICE(0x2001, 0x330D)},//D-Link - Alpha(?)
+ 	{USB_DEVICE(0x0586, 0x341F)},//Zyxel - Abocom
+ 	{USB_DEVICE(0x7392, 0x7822)},//Edimax - Edimax
+ 	{USB_DEVICE(0x2019, 0xAB2B)},//Planex - Abocom

packages/mediacenter/xbmc/patches/xbmc-463-add_remote_devinput-0.1.patch

@@ -1,7 +1,7 @@
 diff -Naur xbmc-10.1-Dharma/system/Lircmap.xml xbmc-10.1-Dharma.patch/system/Lircmap.xml
 --- xbmc-10.1-Dharma/system/Lircmap.xml	2011-06-18 01:43:43.132101246 +0200
 +++ xbmc-10.1-Dharma.patch/system/Lircmap.xml	2011-06-18 01:44:53.777025290 +0200
-@@ -365,7 +365,6 @@
+@@ -409,7 +409,6 @@
  
  	<remote device="linux-input-layer">
  	<altname>cx23885_remote</altname>
@@ -9,7 +9,7 @@ diff -Naur xbmc-10.1-Dharma/system/Lircmap.xml xbmc-10.1-Dharma.patch/system/Lir
  		<left>KEY_LEFT</left>
  		<right>KEY_RIGHT</right>
  		<up>KEY_UP</up>
-@@ -452,4 +451,59 @@
+@@ -510,4 +509,61 @@
  		<mypictures>yellow</mypictures>
  		<myvideo>blue</myvideo>
  	</remote>
@@ -67,5 +67,7 @@ diff -Naur xbmc-10.1-Dharma/system/Lircmap.xml xbmc-10.1-Dharma.patch/system/Lir
 +		<green>KEY_GREEN</green>
 +		<yellow>KEY_YELLOW</yellow>
 +		<blue>KEY_BLUE</blue>
++		<recordedtv>KEY_PVR</recordedtv> 
++		<liveradio>KEY_RADIO</liveradio> 
 +	</remote>
  </lircmap>

packages/mediacenter/xbmc/patches/xbmc-990.06-assert0_is_nasty_this_could_just_be_a_bad_audio.patch

@@ -0,0 +1,26 @@
+From 2c915ea56abd68cf2310eb9d01936d19a2f118ab Mon Sep 17 00:00:00 2001
+From: davilla <davilla@4pi.com>
+Date: Tue, 19 Mar 2013 13:41:53 -0400
+Subject: [PATCH] changed, assert(0) is nasty, this could just be a bad audio
+ packet
+
+---
+ xbmc/cores/dvdplayer/DVDPlayerAudio.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
+index 03ba5ea..e075cd6 100644
+--- a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
++++ b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
+@@ -284,7 +284,7 @@ int CDVDPlayerAudio::DecodeFrame(DVDAudioFrame &audioframe, bool bDropPacket)
+         CLog::Log(LOGERROR, "CDVDPlayerAudio:DecodeFrame - Codec tried to consume more data than available. Potential memory corruption");
+         m_decode.Release();
+         m_pAudioCodec->Reset();
+-        assert(0);
++        return DECODE_FLAG_ERROR;
+       }
+ 
+       m_decode.data += len;
+-- 
+1.8.1.5
+

packages/multimedia/libva-driver-intel/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libva-driver-intel"
-PKG_VERSION="1.0.19"
+PKG_VERSION="1.0.20"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"

packages/multimedia/libva-driver-intel/patches.upstream/libva-driver-intel-1.0.19-automake_1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur intel-driver-1.0.19-old/configure.ac intel-driver-1.0.19-new/configure.ac
---- intel-driver-1.0.19-old/configure.ac	2012-11-08 17:43:34.000000000 -0800
-+++ intel-driver-1.0.19-new/configure.ac	2013-01-03 17:19:13.000000000 -0800
-@@ -22,7 +22,7 @@
- AC_CONFIG_SRCDIR([Makefile.am])
- AM_INIT_AUTOMAKE([1.9 tar-ustar])
- 
--AM_CONFIG_HEADER([src/config.h])
-+AC_CONFIG_HEADERS([src/config.h])
- 
- INTEL_DRIVER_MAJOR_VERSION=intel_driver_major_version
- INTEL_DRIVER_MINOR_VERSION=intel_driver_minor_version

packages/multimedia/libva-driver-intel/patches.upstream/libva-driver-intel-enlarge_dmv_buffer_ivb-001.patch

@@ -1,23 +0,0 @@
-diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c
-index 5b36c8d..2967347 100755
---- a/src/gen7_mfd.c
-+++ b/src/gen7_mfd.c
-@@ -194,7 +194,7 @@ gen7_mfd_init_avc_surface(VADriverContextP ctx,
-     if (gen7_avc_surface->dmv_top == NULL) {
-         gen7_avc_surface->dmv_top = dri_bo_alloc(i965->intel.bufmgr,
-                                                  "direct mv w/r buffer",
--                                                 width_in_mbs * height_in_mbs * 64,
-+                                                 width_in_mbs * (height_in_mbs + 1) * 64,
-                                                  0x1000);
-         assert(gen7_avc_surface->dmv_top);
-     }
-@@ -203,7 +203,7 @@ gen7_mfd_init_avc_surface(VADriverContextP ctx,
-         gen7_avc_surface->dmv_bottom == NULL) {
-         gen7_avc_surface->dmv_bottom = dri_bo_alloc(i965->intel.bufmgr,
-                                                     "direct mv w/r buffer",
--                                                    width_in_mbs * height_in_mbs * 64,                                                    
-+                                                    width_in_mbs * (height_in_mbs + 1) * 64,                                                    
-                                                     0x1000);
-         assert(gen7_avc_surface->dmv_bottom);
-     }
-

packages/multimedia/libva/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libva"
-PKG_VERSION="1.1.0"
+PKG_VERSION="1.1.1"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"

packages/multimedia/libva/patches/libva-1.1.0-automake_1.13.patch

@@ -1,12 +0,0 @@
-diff -Naur libva-1.1.0-old/configure.ac libva-1.1.0-new/configure.ac
---- libva-1.1.0-old/configure.ac	2012-10-04 06:30:51.000000000 -0700
-+++ libva-1.1.0-new/configure.ac	2012-12-30 15:06:37.000000000 -0800
-@@ -86,7 +86,7 @@
- AC_CONFIG_MACRO_DIR([m4])
- AM_INIT_AUTOMAKE([dist-bzip2])
- 
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
- TODAY="`LC_ALL=C date +'%a, %d %b %Y %X %z'`"

packages/network/samba/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="samba"
-PKG_VERSION="3.6.11"
+PKG_VERSION="3.6.13"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/toolchain/math/mpfr/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="mpfr"
-PKG_VERSION="3.1.1"
+PKG_VERSION="3.1.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/tools/bcm2835-bootloader/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="98e5704"
+PKG_VERSION="2bcb2bc"
 PKG_REV="1"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"

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

@@ -22,6 +22,9 @@
 
 . config/options $1
 
+# TODO: xf86-video-intel-2.21.4 dont link with LTO enabled
+  strip_lto
+
 xorg_drv_configure_prepend
 
 cd $PKG_BUILD

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

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