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

packages/addons/service/multimedia/tvheadend/patches/tvheadend-0001-cwc-syslog-move-some-log-messages-to-debug.patch

@@ -0,0 +1,48 @@
+From 30517cb122d0991f0ba51155c9afff6bdc2d8899 Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Wed, 13 Mar 2013 21:30:55 +0200
+Subject: [PATCH] cwc: syslog: move some log messages to debug
+
+---
+ src/capmt.c |    4 ++--
+ src/cwc.c   |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/capmt.c b/src/capmt.c
+index ac507bd..9e12e86 100644
+--- a/src/capmt.c
++++ b/src/capmt.c
+@@ -547,7 +547,7 @@ handle_ca0(capmt_t* capmt) {
+ #endif
+ 
+       if(ct->ct_keystate != CT_RESOLVED)
+-        tvhlog(LOG_INFO, "capmt", "Obtained key for service \"%s\"",t->s_svcname);
++        tvhlog(LOG_DEBUG, "capmt", "Obtained key for service \"%s\"",t->s_svcname);
+ 
+       ct->ct_keystate = CT_RESOLVED;
+     }
+@@ -851,7 +851,7 @@ capmt_table_input(struct th_descrambler *td, struct service *t,
+           cce->cce_ecmsize = len;
+ 
+           if(ct->ct_keystate != CT_RESOLVED)
+-            tvhlog(LOG_INFO, "capmt",
++            tvhlog(LOG_DEBUG, "capmt",
+               "Trying to obtain key for service \"%s\"",t->s_svcname);
+ 
+           buf[9] = pmtversion;
+diff --git a/src/cwc.c b/src/cwc.c
+index ebafd4f..904213f 100644
+--- a/src/cwc.c
++++ b/src/cwc.c
+@@ -873,7 +873,7 @@ forbid:
+     }
+     
+     if(ct->cs_keystate != CS_RESOLVED)
+-      tvhlog(LOG_INFO, "cwc",
++      tvhlog(LOG_DEBUG, "cwc",
+ 	     "Obtained key for service \"%s\" in %"PRId64" ms, from %s:%i",
+ 	     t->s_svcname, delay, ct->cs_cwc->cwc_hostname,
+ 	     ct->cs_cwc->cwc_port);
+-- 
+1.7.10.4
+

packages/addons/service/multimedia/tvheadend/patches/tvheadend-0002-dvb-stop-constant-updating-of-dvb-muxc-onfig.patch

@@ -0,0 +1,94 @@
+From 07cdfdaf6af06ae08a779ccc9082a517757c6fd3 Mon Sep 17 00:00:00 2001
+From: Adam Sutton <dev@adamsutton.me.uk>
+Date: Tue, 12 Mar 2013 15:35:21 +0000
+Subject: [PATCH] Fix #1660 - dvb: stop constant updating of dvb mux
+ configuration files
+
+---
+ src/dvb/dvb_multiplex.c |   23 ++++++++++++++---------
+ 1 file changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/src/dvb/dvb_multiplex.c b/src/dvb/dvb_multiplex.c
+index ff61558..692ebf1 100644
+--- a/src/dvb/dvb_multiplex.c
++++ b/src/dvb/dvb_multiplex.c
+@@ -58,9 +58,6 @@
+   { "OK",           TDMI_FE_OK },
+ };
+ 
+-static void tdmi_set_enable(th_dvb_mux_instance_t *tdmi, int enabled);
+-
+-
+ /**
+  *
+  */
+@@ -856,6 +853,9 @@ int dvb_mux_str2hier(const char *str)
+   if (!networkname || !*networkname)
+     return;
+ 
++  if (!strcmp(tdmi->tdmi_network ?: "", networkname))
++    return;
++
+   free(tdmi->tdmi_network);
+   tdmi->tdmi_network = strdup(networkname);
+   dvb_mux_save(tdmi);
+@@ -879,8 +879,9 @@ int dvb_mux_str2hier(const char *str)
+     if (tdmi->tdmi_transport_stream_id != 0xFFFF || tsid == 0xFFFF)
+       return;
+ 
+-  tdmi->tdmi_transport_stream_id = tsid;
+- 
++  if (tdmi->tdmi_transport_stream_id == tsid)
++    return;
++
+   dvb_mux_save(tdmi);
+ 
+   m = htsmsg_create_map();
+@@ -900,6 +901,9 @@ int dvb_mux_str2hier(const char *str)
+   if (force)
+     if (tdmi->tdmi_network_id != 0 || onid == 0)
+       return;
++  
++  if (tdmi->tdmi_network_id == onid)
++    return;
+ 
+   tdmi->tdmi_network_id = onid;
+  
+@@ -915,13 +919,13 @@ int dvb_mux_str2hier(const char *str)
+ /**
+  *
+  */
+-static void
++static int
+ tdmi_set_enable(th_dvb_mux_instance_t *tdmi, int enabled)
+ {
+   th_dvb_adapter_t *tda = tdmi->tdmi_adapter;
+   
+   if(tdmi->tdmi_enabled == enabled)
+-    return;
++    return 0;
+ 
+   if(tdmi->tdmi_enabled) {
+ 
+@@ -940,6 +944,7 @@ int dvb_mux_str2hier(const char *str)
+     mux_link_initial(tda, tdmi);
+ 
+   subscription_reschedule();
++  return 1;
+ }
+ 
+ /**
+@@ -948,8 +953,8 @@ int dvb_mux_str2hier(const char *str)
+ void
+ dvb_mux_set_enable(th_dvb_mux_instance_t *tdmi, int enabled)
+ {
+-  tdmi_set_enable(tdmi, enabled);
+-  dvb_mux_save(tdmi);
++  if (tdmi_set_enable(tdmi, enabled))
++    dvb_mux_save(tdmi);
+ }
+ 
+ 
+-- 
+1.7.10
+

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

@@ -95,9 +95,9 @@ if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then
 fi
 
 if [ "$DEBUG" = "yes" ]; then
-  ADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
+  TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
 else
-  ADEND_ARG="-C -u root -g video -c $ADDON_HOME"
+  TVHEADEND_ARG="-C -u root -g video -c $ADDON_HOME"
 fi
 
 mkdir -p /var/config

packages/mediacenter/xbmc/patches/xbmc-995.02-only_free_unused_textures_after_a_flip.patch

@@ -0,0 +1,29 @@
+From f3ffe4e25bfca41379e4e2ffba75ad55d13ba30e Mon Sep 17 00:00:00 2001
+From: xbmc <fernetmenta@online.de>
+Date: Thu, 21 Mar 2013 07:53:20 +0100
+Subject: [PATCH] only free unused textures after a flip
+
+---
+ xbmc/Application.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
+index fa0e71d..5bd2d72 100644
+--- a/xbmc/Application.cpp
++++ b/xbmc/Application.cpp
+@@ -2363,11 +2363,10 @@ void CApplication::Render()
+   {
+     g_graphicsContext.Flip(dirtyRegions);
+     g_renderManager.NotifyDisplayFlip();
++    g_TextureManager.FreeUnusedTextures();
+   }
+   CTimeUtils::UpdateFrameTime(flip);
+ 
+-  g_TextureManager.FreeUnusedTextures();
+-
+   g_renderManager.UpdateResolution();
+   g_renderManager.ManageCaptures();
+ }
+-- 
+1.8.1.5
+

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

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

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

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