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

packages/3rdparty/download/CouchPotatoServer/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="CouchPotatoServer"
-PKG_VERSION="a49a00a"
+PKG_VERSION="5a23be2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/3rdparty/download/SickBeard/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="SickBeard"
-PKG_VERSION="4e57625"
+PKG_VERSION="ebec1de"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/3rdparty/download/SickBeard/patches/SickBeard-002-remove_default_settings-0.3.patch

@@ -1,8 +1,8 @@
 diff --git a/data/interfaces/default/config_notifications.tmpl b/data/interfaces/default/config_notifications.tmpl
-index 826cf0a..02f14af 100755
+index 2144a0f..703c99e 100755
 --- a/data/interfaces/default/config_notifications.tmpl
 +++ b/data/interfaces/default/config_notifications.tmpl
-@@ -547,45 +547,6 @@
+@@ -639,45 +639,6 @@
  
                  <div class="component-group clearfix">
                      <div class="component-group-desc">
@@ -12,7 +12,7 @@ index 826cf0a..02f14af 100755
 -                    </div>
 -                    <fieldset class="component-group-list">
 -                        <div class="field-pair">
--                            <input type="checkbox" class="enabler" name="use_libnotify" id="use_libnotify" #if $sickbeard.USE_LIBNOTIFY then "checked=\"checked\"" else ""# /> 
+-                            <input type="checkbox" class="enabler" name="use_libnotify" id="use_libnotify" #if $sickbeard.USE_LIBNOTIFY then "checked=\"checked\"" else ""# />
 -                            <label class="clearfix" for="use_libnotify">
 -                                <span class="component-title">Enable</span>
 -                                <span class="component-desc">Should Sick Beard send Libnotify notifications?</span>
@@ -21,7 +21,7 @@ index 826cf0a..02f14af 100755
 -
 -                        <div id="content_use_libnotify">
 -                            <div class="field-pair">
--                                <input type="checkbox" name="libnotify_notify_onsnatch" id="libnotify_notify_onsnatch" #if $sickbeard.LIBNOTIFY_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# /> 
+-                                <input type="checkbox" name="libnotify_notify_onsnatch" id="libnotify_notify_onsnatch" #if $sickbeard.LIBNOTIFY_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# />
 -                                <label class="clearfix" for="libnotify_notify_onsnatch">
 -                                    <span class="component-title">Notify on Snatch</span>
 -                                    <span class="component-desc">Send notification when we start a download?</span>
@@ -62,10 +62,10 @@ index fb38f17..4ead36f 100644
                                  <li class="divider"></li>
                                  <li><a href="$sbRoot/config/providers/"><i class="icon-cog"></i> Search Providers</a></li>
 diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
-index 20f0dfc..b0bf6a6 100644
+index da9ff7f..36b608e 100644
 --- a/sickbeard/webserve.py
 +++ b/sickbeard/webserve.py
-@@ -609,7 +609,6 @@ class History:
+@@ -613,7 +613,6 @@ class History:
  
  
  ConfigMenu = [

packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt

@@ -1,3 +1,8 @@
+3.0.7
+- update to CouchPotatoServe-5a23be2
+- update to SickBeard-ebec1de
+- fix executehttpapi startup error
+
 3.0.6
 - fix configobj error n startup
 

packages/addons/service/downloadmanager/SABnzbd-Suite/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="SABnzbd-Suite"
 PKG_VERSION="3.0"
-PKG_REV="6"
+PKG_REV="7"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.openelec.tv"

packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py

@@ -98,14 +98,9 @@ while (not xbmc.abortRequested):
 
             # reset idle timer when we're close to idle sleep/shutdown
             if sabIsActive:
-                response = xbmc.executehttpapi("GetGUISetting(0;powermanagement.shutdowntime)").replace('<li>','')
+                xbmc.executebuiltin('InhibitIdleShutdown(true)')
-                shutdownTime = int(response) * 60
+            else:
-                idleTime = xbmc.getGlobalIdleTime()
+                xbmc.executebuiltin('InhibitIdleShutdown(false)')
-                timeToShutdown = shutdownTime - idleTime
-
-                if (timeToShutdown <= checkInterval - timeout):
-                    xbmc.log('SABnzbd-Suite: still downloading. Resetting XBMC idle timer.')
-                    xbmc.executehttpapi("SendKey(0xF000)")
 
         # calculate and set the time to wake up at (if any)
         if wakePeriodically:

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

@@ -1,3 +1,6 @@
+3.0.7
+- update to TVHeadend 3.3.511
+
 3.0.6
 - update to TVHeadend 3.3.491
 - disable avahi support

packages/addons/service/multimedia/tvheadend/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="tvheadend"
-PKG_VERSION="3.3.491"
+PKG_VERSION="3.3.511"
-PKG_REV="6"
+PKG_REV="7"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

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

@@ -1,48 +0,0 @@
-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

@@ -1,94 +0,0 @@
-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/devel/gmp/build

@@ -36,7 +36,6 @@ mkdir -p .objdir-target && cd .objdir-target
              --localstatedir=/var \
              --disable-static \
              --enable-shared \
-             --disable-mpbsd \
              --disable-cxx \
 
 make

packages/devel/gmp/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="gmp"
-PKG_VERSION="5.0.5"
+PKG_VERSION="5.1.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://gmplib.org/"
-PKG_URL="http://ftp.sunet.se/pub/gnu/gmp/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://ftp.gmplib.org/pub/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"

packages/devel/gmp/patches/gmp-5.0.5-automake-1.13.patch

@@ -1,36 +0,0 @@
-diff -Naur gmp-5.0.5/configure.in gmp-5.0.5.patch/configure.in
---- gmp-5.0.5/configure.in	2012-05-06 13:19:49.000000000 +0200
-+++ gmp-5.0.5.patch/configure.in	2013-01-12 02:25:31.897257189 +0100
-@@ -65,8 +65,8 @@
- dnl  Note that there's a copy of these options in the top-level Makefile.am,
- dnl  so update there too if changing anything.
- dnl
--AM_INIT_AUTOMAKE([1.8 gnu no-dependencies $(top_builddir)/ansi2knr])
--AM_CONFIG_HEADER(config.h:config.in)
-+AM_INIT_AUTOMAKE([1.8 gnu no-dependencies])
-+AC_CONFIG_HEADERS(config.h:config.in)
- AM_MAINTAINER_MODE
- 
- 
-@@ -2228,9 +2228,6 @@
- echo "      MPN_PATH=\"$path\""
- 
- 
--# Automake ansi2knr support.
--AM_C_PROTOTYPES
--
- CL_AS_NOEXECSTACK
- 
- GMP_PROG_AR
-diff -Naur gmp-5.0.5/Makefile.am gmp-5.0.5.patch/Makefile.am
---- gmp-5.0.5/Makefile.am	2012-05-06 13:19:49.000000000 +0200
-+++ gmp-5.0.5.patch/Makefile.am	2013-01-12 02:25:09.603364249 +0100
-@@ -25,7 +25,7 @@
- # Makefiles in subdirectories, but here we must omit it so automake gives
- # the actual ansi2knr build rule, not "cd $(top_builddir) && make ansi2knr".
- #
--AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr
-+AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies
- 
- 
- # Libtool -version-info for libgmp.la and libmp.la.  See "Versioning" in the

packages/toolchain/devel/binutils/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="binutils"
-PKG_VERSION="2.23.2"
+PKG_VERSION="2.23.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/toolchain/math/gmp-host/build

@@ -38,10 +38,8 @@ mkdir -p .objdir-host && cd .objdir-host
              --prefix=$ROOT/$TOOLCHAIN \
              --enable-shared \
              --disable-static \
-             --enable-mpbsd \
              --enable-cxx \
 
-#             --target=$TARGET_NAME \
 make
 make check
 make install

packages/toolchain/math/ppl/meta

@@ -19,12 +19,13 @@
 ################################################################################
 
 PKG_NAME="ppl"
-PKG_VERSION="1.0"
+PKG_VERSION="1.1pre7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.cs.unipr.it/ppl"
-PKG_URL="http://bugseng.com/products/ppl/download/ftp/releases/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://bugseng.com/products/ppl/download/ftp/snapshots/$PKG_NAME-$PKG_VERSION.tar.xz"
+#PKG_URL="http://bugseng.com/products/ppl/download/ftp/releases/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="ccache gmp-host"
 PKG_PRIORITY="optional"