From 8e4534c7b00cde376c8f018483555fc6f5aa9eed Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Fri, 8 Feb 2013 18:10:56 +0100 Subject: [PATCH 01/13] new package: add package 'dstat' --- packages/debug/dstat/install | 28 ++++++++++++++++++++++++++++ packages/debug/dstat/meta | 36 ++++++++++++++++++++++++++++++++++++ packages/debug/meta | 2 +- 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100755 packages/debug/dstat/install create mode 100644 packages/debug/dstat/meta diff --git a/packages/debug/dstat/install b/packages/debug/dstat/install new file mode 100755 index 0000000000..4a8bc9bff7 --- /dev/null +++ b/packages/debug/dstat/install @@ -0,0 +1,28 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2013 Dag Wieers (dag@wieers.com) +# +# 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 + +mkdir -p $INSTALL/usr/bin/ +cp $PKG_BUILD/dstat $INSTALL/usr/bin/ +mkdir -p $INSTALL/usr/share/dstat/ +cp $PKG_BUILD/plugins/dstat_*.py $INSTALL/usr/share/dstat/ diff --git a/packages/debug/dstat/meta b/packages/debug/dstat/meta new file mode 100644 index 0000000000..f339ea007d --- /dev/null +++ b/packages/debug/dstat/meta @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2013 Dag Wieers (dag@wieers.com) +# +# 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 +################################################################################ + +PKG_NAME="dstat" +PKG_VERSION="0.7.2" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://dag.wieers.com/home-made/dstat/" +PKG_URL="http://dag.wieers.com/home-made/dstat/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_DEPENDS="python" +PKG_BUILD_DEPENDS="toolchain python" +PKG_PRIORITY="optional" +PKG_SECTION="system" +PKG_SHORTDESC="dstat: versatile resource statistics tool" +PKG_LONGDESC="Dstat is a versatile replacement for vmstat, iostat, netstat and ifstat. Dstat overcomes some of their limitations and adds some extra features, more counters and flexibility. Dstat is handy for monitoring systems during performance tuning tests, benchmarks or troubleshooting." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/debug/meta b/packages/debug/meta index ec0d08a6b6..57ecc573d3 100644 --- a/packages/debug/meta +++ b/packages/debug/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS="acpica cpuid dmidecode evtest gdb hddtemp htop i2c-tools pmtools powertop strace" +PKG_DEPENDS="acpica cpuid dmidecode dstat evtest gdb hddtemp htop i2c-tools pmtools powertop strace" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" PKG_SECTION="debug" From ab35dbe2ae0b56a0426f01c7efe60e565dc2bb9f Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Fri, 8 Feb 2013 23:31:56 +0100 Subject: [PATCH 02/13] Remote syslog support from OpenELEC settings This patch adds remote syslog support. The syslog startup script will add the necessary options, and leaves room for a custom syslog.conf from /storage/.config (as it was before). --- .../config/default_settings.xml | 2 ++ .../resources/language/English/strings.xml | 4 ++++ .../source/resources/settings.xml | 4 ++++ packages/sysutils/busybox/init.d/08_syslogd | 17 +++++++++++++---- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml index 7694941487..af1f23e09b 100644 --- a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml @@ -31,6 +31,8 @@ + + diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml index b083744f13..21f01629a1 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml @@ -50,4 +50,8 @@ crond Start cron daemon at boot + syslog + Use remote syslog server + Remote syslog IP address + diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml index b41164ad77..c0bc00950a 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml @@ -81,5 +81,9 @@ + + + + diff --git a/packages/sysutils/busybox/init.d/08_syslogd b/packages/sysutils/busybox/init.d/08_syslogd index 524c77d8cd..d3cf2e3242 100644 --- a/packages/sysutils/busybox/init.d/08_syslogd +++ b/packages/sysutils/busybox/init.d/08_syslogd @@ -25,12 +25,21 @@ ( progress "Starting Syslog daemon" - if [ -f /storage/.config/syslog.conf ]; then - syslogd -f /storage/.config/syslog.conf - else - syslogd + + source /var/config/settings.conf + + SYSLOGD_OPTIONS="-L" + + if [ "$SYSLOG_REMOTE" == "true" -a "$SYSLOG_SERVER" ]; then + SYSLOGD_OPTIONS="$SYSLOGD_OPTIONS -R $SYSLOG_SERVER" fi + if [ -f /storage/.config/syslog.conf ]; then + SYSLOGD_OPTIONS="$SYSLOGD_OPTIONS -f /storage/.config/syslog.conf" + fi + + syslogd $SYSLOGD_OPTIONS + progress "Starting Kernellog daemon" klogd )& From 9421787d2ebfaa8114d9c0eed9367a5235fcb4b9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 9 Feb 2013 01:09:43 +0100 Subject: [PATCH 03/13] linux: add patches to fix conflicting IEC958 controls, thanks to anssi Signed-off-by: Stephan Raue --- ...ound_for_conflicting_IEC958_controls.patch | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 packages/linux/patches/3.7.6/linux-990.04-hda-Fix_the_workaround_for_conflicting_IEC958_controls.patch diff --git a/packages/linux/patches/3.7.6/linux-990.04-hda-Fix_the_workaround_for_conflicting_IEC958_controls.patch b/packages/linux/patches/3.7.6/linux-990.04-hda-Fix_the_workaround_for_conflicting_IEC958_controls.patch new file mode 100644 index 0000000000..b042469a87 --- /dev/null +++ b/packages/linux/patches/3.7.6/linux-990.04-hda-Fix_the_workaround_for_conflicting_IEC958_controls.patch @@ -0,0 +1,94 @@ +From 1aec20670bfd1c0680d2ea4b29c4e5d8f1bdb43f Mon Sep 17 00:00:00 2001 +From: Anssi Hannula +Date: Sat, 9 Feb 2013 00:19:09 +0200 +Subject: [PATCH] ALSA: hda - Fix the workaround for conflicting IEC958 + controls + +Commit dcda5806165c155d90b9aa466a1602cf4726012b ("ALSA: hda - Add +workaround for conflicting IEC958 controls") added a workaround for +cards that have both an S/PDIF and an HDMI device, so that S/PDIF IEC958 +controls will be moved to device=1 on such cards. + +However, the workaround did not take it into account that the S/PDIF and +HDMI devices may be on different codecs of the same card. Currently this +is always the case, and the workaround therefore fails to work. + +Fix the workaround to handle card-wide IEC958 conflicts. + +Reported-by: Stephan Raue +Signed-off-by: Anssi Hannula +--- + sound/pci/hda/hda_codec.c | 27 +++++++++++++++------------ + sound/pci/hda/hda_codec.h | 4 +++- + 2 files changed, 18 insertions(+), 13 deletions(-) + +diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c +index 822df97..fe5d6fc 100644 +--- a/sound/pci/hda/hda_codec.c ++++ b/sound/pci/hda/hda_codec.c +@@ -3135,25 +3135,28 @@ int snd_hda_create_dig_out_ctls(struct hda_codec *codec, + int idx, dev = 0; + const int spdif_pcm_dev = 1; + struct hda_spdif_out *spdif; ++ struct hda_codec *c; + +- if (codec->primary_dig_out_type == HDA_PCM_TYPE_HDMI && ++ if (codec->bus->primary_dig_out_type == HDA_PCM_TYPE_HDMI && + type == HDA_PCM_TYPE_SPDIF) { + dev = spdif_pcm_dev; +- } else if (codec->primary_dig_out_type == HDA_PCM_TYPE_SPDIF && ++ } else if (codec->bus->primary_dig_out_type == HDA_PCM_TYPE_SPDIF && + type == HDA_PCM_TYPE_HDMI) { +- for (idx = 0; idx < codec->spdif_out.used; idx++) { +- spdif = snd_array_elem(&codec->spdif_out, idx); +- for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) { +- kctl = find_mixer_ctl(codec, dig_mix->name, 0, idx); +- if (!kctl) +- break; +- kctl->id.device = spdif_pcm_dev; ++ list_for_each_entry(c, &codec->bus->codec_list, list) { ++ for (idx = 0; idx < c->spdif_out.used; idx++) { ++ spdif = snd_array_elem(&c->spdif_out, idx); ++ for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) { ++ kctl = find_mixer_ctl(c, dig_mix->name, 0, idx); ++ if (!kctl) ++ break; ++ kctl->id.device = spdif_pcm_dev; ++ } + } + } +- codec->primary_dig_out_type = HDA_PCM_TYPE_HDMI; ++ codec->bus->primary_dig_out_type = HDA_PCM_TYPE_HDMI; + } +- if (!codec->primary_dig_out_type) +- codec->primary_dig_out_type = type; ++ if (!codec->bus->primary_dig_out_type) ++ codec->bus->primary_dig_out_type = type; + + idx = find_empty_mixer_ctl_idx(codec, "IEC958 Playback Switch", dev); + if (idx < 0) { +diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h +index 8665540..ab807f7 100644 +--- a/sound/pci/hda/hda_codec.h ++++ b/sound/pci/hda/hda_codec.h +@@ -671,6 +671,9 @@ struct hda_bus { + unsigned int response_reset:1; /* controller was reset */ + unsigned int in_reset:1; /* during reset operation */ + unsigned int power_keep_link_on:1; /* don't power off HDA link */ ++ ++ /* primary digital out PCM type */ ++ int primary_dig_out_type; + }; + + /* +@@ -837,7 +840,6 @@ struct hda_codec { + struct mutex hash_mutex; + struct snd_array spdif_out; + unsigned int spdif_in_enable; /* SPDIF input enable? */ +- int primary_dig_out_type; /* primary digital out PCM type */ + const hda_nid_t *slave_dig_outs; /* optional digital out slave widgets */ + struct snd_array init_pins; /* initial (BIOS) pin configurations */ + struct snd_array driver_pins; /* pin configs set by codec parser */ +-- +1.7.10 + From 6d12955c0794900c91eecb97f6cb3126d5eb6221 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 9 Feb 2013 01:10:15 +0100 Subject: [PATCH 04/13] alsa-lib: add various alsa upstream patches and fixes, thanks to anssi Signed-off-by: Stephan Raue --- ...ol_Simplify_usingsnd_config_get_bool.patch | 87 +++++++++++++ ...flicting_IEC958controls_for_HD-audio.patch | 122 ++++++++++++++++++ ...round-for-handling-IEC958-workaround.patch | 37 ++++++ 3 files changed, 246 insertions(+) create mode 100644 packages/audio/alsa-lib/patches/alsa-lib-990.01-control_Simplify_usingsnd_config_get_bool.patch create mode 100644 packages/audio/alsa-lib/patches/alsa-lib-990.02-Add_workaround_for_conflicting_IEC958controls_for_HD-audio.patch create mode 100644 packages/audio/alsa-lib/patches/alsa-lib-990.04-hcontrol-Add-workaround-for-handling-IEC958-workaround.patch diff --git a/packages/audio/alsa-lib/patches/alsa-lib-990.01-control_Simplify_usingsnd_config_get_bool.patch b/packages/audio/alsa-lib/patches/alsa-lib-990.01-control_Simplify_usingsnd_config_get_bool.patch new file mode 100644 index 0000000000..3d679bf07e --- /dev/null +++ b/packages/audio/alsa-lib/patches/alsa-lib-990.01-control_Simplify_usingsnd_config_get_bool.patch @@ -0,0 +1,87 @@ +From: Takashi Iwai suse.de> +Subject: [PATCH RFC 1/2] control: Simplify using snd_config_get_bool() +Newsgroups: gmane.linux.alsa.devel +Date: 2012-10-12 15:25:23 GMT (17 weeks, 8 hours and 26 minutes ago) +snd_config_get_bool() was improved to parse also ASCII strings now, +so we don't have to open-code the boolean parser in +src/control/setup.c any longer. + +Signed-off-by: Takashi Iwai suse.de> +--- + src/control/setup.c | 37 ++++++------------------------------- + 1 file changed, 6 insertions(+), 31 deletions(-) + +diff --git a/src/control/setup.c b/src/control/setup.c +index eecda45..bd3599d 100644 +--- a/src/control/setup.c ++++ b/src/control/setup.c +@@ -400,7 +400,6 @@ static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_da + { + snd_config_t *conf; + snd_config_iterator_t i, next; +- char *tmp; + int iface = SND_CTL_ELEM_IFACE_MIXER; + const char *name = NULL; + long index = 0; +@@ -464,33 +463,17 @@ static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_da + continue; + } + if (strcmp(id, "lock") == 0) { +- if ((err = snd_config_get_ascii(n, &tmp)) < 0) { +- SNDERR("field %s has an invalid type", id); +- goto _err; +- } +- err = snd_config_get_bool_ascii(tmp); +- if (err < 0) { +- SNDERR("field %s is not a boolean", id); +- free(tmp); ++ err = snd_config_get_bool(n); ++ if (err < 0) + goto _err; +- } + lock = err; +- free(tmp); + continue; + } + if (strcmp(id, "preserve") == 0) { +- if ((err = snd_config_get_ascii(n, &tmp)) < 0) { +- SNDERR("field %s has an invalid type", id); +- goto _err; +- } +- err = snd_config_get_bool_ascii(tmp); +- if (err < 0) { +- SNDERR("field %s is not a boolean", id); +- free(tmp); ++ err = snd_config_get_bool(n); ++ if (err < 0) + goto _err; +- } + preserve = err; +- free(tmp); + continue; + } + if (strcmp(id, "value") == 0) { +@@ -502,18 +485,10 @@ static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_da + continue; + } + if (strcmp(id, "optional") == 0) { +- if ((err = snd_config_get_ascii(n, &tmp)) < 0) { +- SNDERR("field %s has an invalid type", id); +- goto _err; +- } +- err = snd_config_get_bool_ascii(tmp); +- if (err < 0) { +- SNDERR("field %s is not a boolean", id); +- free(tmp); ++ err = snd_config_get_bool(n); ++ if (err < 0) + goto _err; +- } + optional = err; +- free(tmp); + continue; + } + SNDERR("Unknown field %s", id); +-- +1.7.12.2 + diff --git a/packages/audio/alsa-lib/patches/alsa-lib-990.02-Add_workaround_for_conflicting_IEC958controls_for_HD-audio.patch b/packages/audio/alsa-lib/patches/alsa-lib-990.02-Add_workaround_for_conflicting_IEC958controls_for_HD-audio.patch new file mode 100644 index 0000000000..cbe465673f --- /dev/null +++ b/packages/audio/alsa-lib/patches/alsa-lib-990.02-Add_workaround_for_conflicting_IEC958controls_for_HD-audio.patch @@ -0,0 +1,122 @@ +From: Takashi Iwai suse.de> +Subject: [PATCH RFC 2/2] Add workaround for conflicting IEC958 controls for HD-audio +Newsgroups: gmane.linux.alsa.devel +Date: 2012-10-12 15:25:49 GMT (17 weeks, 8 hours and 27 minutes ago) +When both an SPDIF and an HDMI output are present on HD-audio, both +try to access IEC958 controls with index=0 although one of them must +be wrong. For avoiding this conflict, the recent kernel code moves +the IEC958 controls of an SPDIF with device=1 once when the conflict +happens. + +In this patch, the corresponding support is added in alsa-lib side. +The new "skip_rest" boolean flag is added to the hooked element +definition which indicates that the rest of element array will be +ignored once when this element is present and evaluated. With this +new flag, the HD-audio config takes device=1 primarily, then take +device=0 as fallback. + +Signed-off-by: Takashi Iwai suse.de> +--- + src/conf/cards/HDA-Intel.conf | 16 ++++++++++++++++ + src/control/setup.c | 19 ++++++++++++++++--- + 2 files changed, 32 insertions(+), 3 deletions(-) + +diff --git a/src/conf/cards/HDA-Intel.conf b/src/conf/cards/HDA-Intel.conf +index d4f2667..55fb624 100644 +--- a/src/conf/cards/HDA-Intel.conf ++++ b/src/conf/cards/HDA-Intel.conf +@@ -113,6 +113,22 @@ HDA-Intel.pcm.iec958.0 { + hook_args [ + { + name "IEC958 Playback Default" ++ device 1 ++ optional true ++ lock true ++ preserve true ++ value [ $AES0 $AES1 $AES2 $AES3 ] ++ } ++ { ++ name "IEC958 Playback Switch" ++ device 1 ++ optional true ++ value true ++ # if this element is present, skip the rest ++ skip_rest true ++ } ++ { ++ name "IEC958 Playback Default" + lock true + preserve true + value [ $AES0 $AES1 $AES2 $AES3 ] +diff --git a/src/control/setup.c b/src/control/setup.c +index bd3599d..f23bf2c 100644 +--- a/src/control/setup.c ++++ b/src/control/setup.c +@@ -396,7 +396,7 @@ static int snd_config_get_ctl_elem_value(snd_config_t *conf, + return 0; + } + +-static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_data) ++static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_data, int *quit) + { + snd_config_t *conf; + snd_config_iterator_t i, next; +@@ -408,6 +408,7 @@ static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_da + int lock = 0; + int preserve = 0; + int optional = 0; ++ int skip_rest = 0; + snd_config_t *value = NULL, *mask = NULL; + snd_sctl_elem_t *elem = NULL; + int err; +@@ -491,6 +492,13 @@ static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_da + optional = err; + continue; + } ++ if (strcmp(id, "skip_rest") == 0) { ++ err = snd_config_get_bool(n); ++ if (err < 0) ++ goto _err; ++ skip_rest = err; ++ continue; ++ } + SNDERR("Unknown field %s", id); + return -EINVAL; + } +@@ -539,6 +547,9 @@ static int add_elem(snd_sctl_t *h, snd_config_t *_conf, snd_config_t *private_da + if (! optional) + SNDERR("Cannot obtain info for CTL elem (%s,'%s',%li,%li,%li): %s",snd_ctl_elem_iface_name(iface), name, index, device, subdevice, snd_strerror(err)); + goto _err; ++ } else { ++ if (skip_rest) ++ *quit = 1; + } + snd_ctl_elem_value_set_id(elem->val, elem->id); + snd_ctl_elem_value_set_id(elem->old, elem->id); +@@ -594,7 +605,7 @@ int snd_sctl_build(snd_sctl_t **sctl, snd_ctl_t *handle, snd_config_t *conf, snd + { + snd_sctl_t *h; + snd_config_iterator_t i, next; +- int err; ++ int err, quit = 0; + + assert(sctl); + assert(handle); +@@ -614,11 +625,13 @@ int snd_sctl_build(snd_sctl_t **sctl, snd_ctl_t *handle, snd_config_t *conf, snd + INIT_LIST_HEAD(&h->elems); + snd_config_for_each(i, next, conf) { + snd_config_t *n = snd_config_iterator_entry(i); +- err = add_elem(h, n, private_data); ++ err = add_elem(h, n, private_data, &quit); + if (err < 0) { + free_elems(h); + return err; + } ++ if (quit) ++ break; + } + *sctl = h; + return 0; +-- +1.7.12.2 + diff --git a/packages/audio/alsa-lib/patches/alsa-lib-990.04-hcontrol-Add-workaround-for-handling-IEC958-workaround.patch b/packages/audio/alsa-lib/patches/alsa-lib-990.04-hcontrol-Add-workaround-for-handling-IEC958-workaround.patch new file mode 100644 index 0000000000..4e14e471ea --- /dev/null +++ b/packages/audio/alsa-lib/patches/alsa-lib-990.04-hcontrol-Add-workaround-for-handling-IEC958-workaround.patch @@ -0,0 +1,37 @@ +From b7f85e4b35aeead9b3c64f06c0c4a4617baaf7f5 Mon Sep 17 00:00:00 2001 +From: Anssi Hannula +Date: Sat, 9 Feb 2013 01:37:48 +0200 +Subject: [PATCH] hcontrol: Add workaround for handling IEC958 workaround + +IEC958 workaround in the kernel can cause controls that have same the +same name and index but a different device. + +Temporarily ignore failure of adding such conflicting controls if the +mixer class fails on them. +--- + src/control/hcontrol.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/control/hcontrol.c b/src/control/hcontrol.c +index ee1d907..dfc0a5a 100644 +--- a/src/control/hcontrol.c ++++ b/src/control/hcontrol.c +@@ -612,8 +612,13 @@ int snd_hctl_load(snd_hctl_t *hctl) + for (idx = 0; idx < hctl->count; idx++) { + int res = snd_hctl_throw_event(hctl, SNDRV_CTL_EVENT_MASK_ADD, + hctl->pelems[idx]); +- if (res < 0) +- return res; ++ if (res < 0) { ++ if (res == -EINVAL && snd_hctl_elem_get_device(hctl->pelems[idx]) == 1) { ++ SNDERR("ignoring mixer element addition failure on device 1 - IEC958 conflict workaround"); ++ } else { ++ return res; ++ } ++ } + } + err = snd_ctl_subscribe_events(hctl->ctl, 1); + _end: +-- +1.7.10 + From 314b3a76bb5a40a51d9225ff8e3b998cf500831a Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Sat, 9 Feb 2013 01:20:16 +0100 Subject: [PATCH 05/13] Fix typo in script name --- .../busybox/init.d/{02_make-directorys => 02_make-directories} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/sysutils/busybox/init.d/{02_make-directorys => 02_make-directories} (100%) diff --git a/packages/sysutils/busybox/init.d/02_make-directorys b/packages/sysutils/busybox/init.d/02_make-directories similarity index 100% rename from packages/sysutils/busybox/init.d/02_make-directorys rename to packages/sysutils/busybox/init.d/02_make-directories From bb60e57b608fc36019450d017dcf7ebede580d4f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 9 Feb 2013 01:36:14 +0100 Subject: [PATCH 06/13] dstat: typo Signed-off-by: Stephan Raue --- packages/debug/dstat/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/debug/dstat/meta b/packages/debug/dstat/meta index f339ea007d..a69df68bf0 100644 --- a/packages/debug/dstat/meta +++ b/packages/debug/dstat/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://dag.wieers.com/home-made/dstat/" PKG_URL="http://dag.wieers.com/home-made/dstat/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="python" -PKG_BUILD_DEPENDS="toolchain python" +PKG_DEPENDS="Python" +PKG_BUILD_DEPENDS="toolchain Python" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="dstat: versatile resource statistics tool" From 36f99727ee52bba8dee074189a98f889b72105ea Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 9 Feb 2013 01:36:52 +0100 Subject: [PATCH 07/13] busybox: add 'renice' applet Signed-off-by: Stephan Raue --- packages/sysutils/busybox/config/busybox.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index 11e1b64d3e..ab0017cc50 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.21.0 -# Tue Jan 22 03:01:53 2013 +# Fri Feb 8 17:06:15 2013 # CONFIG_HAVE_DOT_CONFIG=y @@ -920,7 +920,7 @@ CONFIG_PS=y CONFIG_FEATURE_PS_TIME=y CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -# CONFIG_RENICE is not set +CONFIG_RENICE=y CONFIG_BB_SYSCTL=y CONFIG_FEATURE_SHOW_THREADS=y # CONFIG_WATCH is not set From dae8099efc429b5f5761dce8e0f919da497b54b0 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 9 Feb 2013 13:40:35 +0200 Subject: [PATCH 08/13] SABnzbd-Suite: add option to enable restart on resume, add sleep.d script --- .../SABnzbd-Suite/config/settings.xml | 1 + .../resources/language/English/strings.xml | 1 + .../source/resources/settings.xml | 1 + .../source/sleep.d/SABnzbd-Suite.power | 51 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 packages/addons/service/downloadmanager/SABnzbd-Suite/source/sleep.d/SABnzbd-Suite.power diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml index 74e7b9ba84..3d34bb5d21 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml @@ -10,4 +10,5 @@ + diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml index d34ed45af5..ca7f995bdb 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml @@ -17,5 +17,6 @@ Keep awake while downloading Wake up periodically Wake up at + Restart on suspend / resume diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml index e996371150..2cc11a2521 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml @@ -24,6 +24,7 @@ + diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/sleep.d/SABnzbd-Suite.power b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/sleep.d/SABnzbd-Suite.power new file mode 100644 index 0000000000..b1674a064e --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/sleep.d/SABnzbd-Suite.power @@ -0,0 +1,51 @@ +#!/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 +################################################################################ + +. /etc/profile + +ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.SABnzbd-Suite" +ADDON_SETTINGS="$ADDON_HOME/settings.xml" +RESTART_ON_RESUME=`grep RESTART_ON_RESUME $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` + +LOCKFILE="/var/lock/SABnzbd-Suite.sleep" + +if [ "$RESTART_ON_RESUME" == "true" ] ; then + case "$1" in + hibernate|suspend) + if [ ! -z "`ps | grep -E 'python.*service.downloadmanager.SABnzbd-Suite' | awk '{print $1}'`" ] ; then + progress "Shutting down SABnzbd-Suite for suspending..." + SABnzbd-Suite.stop + touch $LOCKFILE + fi + ;; + + thaw|resume) + progress "Restarting SABnzbd-Suite for wakeup..." + if [ -f "$LOCKFILE" ] ; then + rm -rf "$LOCKFILE" + python $HOME/.xbmc/addons/service.downloadmanager.SABnzbd-Suite/bin/SABnzbd-Suite.py + fi + ;; + *) exit $NA + ;; + esac +fi From 1285beadd1cbdda3fa7793ebcd6dee3b32faff88 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 9 Feb 2013 19:45:53 +0200 Subject: [PATCH 09/13] SABnzbd: update to SABnzbd-0.7.11 --- packages/3rdparty/download/SABnzbd/meta | 2 +- ...tch => SABnzbd-0.7.11-001_remove_default_settings-0.3.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/3rdparty/download/SABnzbd/patches/{SABnzbd-0.7.9-001_remove_default_settings-0.3.patch => SABnzbd-0.7.11-001_remove_default_settings-0.3.patch} (100%) diff --git a/packages/3rdparty/download/SABnzbd/meta b/packages/3rdparty/download/SABnzbd/meta index 284a40a10d..520efa73b3 100644 --- a/packages/3rdparty/download/SABnzbd/meta +++ b/packages/3rdparty/download/SABnzbd/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="SABnzbd" -PKG_VERSION="0.7.9" +PKG_VERSION="0.7.11" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.9-001_remove_default_settings-0.3.patch b/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.11-001_remove_default_settings-0.3.patch similarity index 100% rename from packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.9-001_remove_default_settings-0.3.patch rename to packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.11-001_remove_default_settings-0.3.patch From aceb2552bc3f8c2737acef2b55e6b2ea7bf4ce28 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 9 Feb 2013 19:46:46 +0200 Subject: [PATCH 10/13] CouchPotatoServer: update to CouchPotatoServer-811f35b --- packages/3rdparty/download/CouchPotatoServer/meta | 2 +- ...e-cache.patch => CouchPotatoServer-811f35b-move-cache.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/3rdparty/download/CouchPotatoServer/patches/{CouchPotatoServer-393c14d-move-cache.patch => CouchPotatoServer-811f35b-move-cache.patch} (100%) diff --git a/packages/3rdparty/download/CouchPotatoServer/meta b/packages/3rdparty/download/CouchPotatoServer/meta index f3ef7472ca..dac6f7c74a 100644 --- a/packages/3rdparty/download/CouchPotatoServer/meta +++ b/packages/3rdparty/download/CouchPotatoServer/meta @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="CouchPotatoServer" -PKG_VERSION="393c14d" +PKG_VERSION="811f35b" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-393c14d-move-cache.patch b/packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-811f35b-move-cache.patch similarity index 100% rename from packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-393c14d-move-cache.patch rename to packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-811f35b-move-cache.patch From 08aabd4338a1a52e172787e397c998f6850e7390 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 9 Feb 2013 19:47:45 +0200 Subject: [PATCH 11/13] SickBeard: update to SickBeard-6cb5e76 --- packages/3rdparty/download/SickBeard/meta | 2 +- ...6-001-remove_logo_update-header_and_donate_button-0.1.patch} | 0 ... => SickBeard-6cb5e76-002-remove_default_settings-0.3.patch} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename packages/3rdparty/download/SickBeard/patches/{SickBeard-e6dcfb3-001-remove_logo_update-header_and_donate_button-0.1.patch => SickBeard-6cb5e76-001-remove_logo_update-header_and_donate_button-0.1.patch} (100%) rename packages/3rdparty/download/SickBeard/patches/{SickBeard-e6dcfb3-002-remove_default_settings-0.3.patch => SickBeard-6cb5e76-002-remove_default_settings-0.3.patch} (100%) diff --git a/packages/3rdparty/download/SickBeard/meta b/packages/3rdparty/download/SickBeard/meta index 264e4f6246..a2e9c6546d 100644 --- a/packages/3rdparty/download/SickBeard/meta +++ b/packages/3rdparty/download/SickBeard/meta @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="SickBeard" -PKG_VERSION="e6dcfb3" +PKG_VERSION="6cb5e76" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/3rdparty/download/SickBeard/patches/SickBeard-e6dcfb3-001-remove_logo_update-header_and_donate_button-0.1.patch b/packages/3rdparty/download/SickBeard/patches/SickBeard-6cb5e76-001-remove_logo_update-header_and_donate_button-0.1.patch similarity index 100% rename from packages/3rdparty/download/SickBeard/patches/SickBeard-e6dcfb3-001-remove_logo_update-header_and_donate_button-0.1.patch rename to packages/3rdparty/download/SickBeard/patches/SickBeard-6cb5e76-001-remove_logo_update-header_and_donate_button-0.1.patch diff --git a/packages/3rdparty/download/SickBeard/patches/SickBeard-e6dcfb3-002-remove_default_settings-0.3.patch b/packages/3rdparty/download/SickBeard/patches/SickBeard-6cb5e76-002-remove_default_settings-0.3.patch similarity index 100% rename from packages/3rdparty/download/SickBeard/patches/SickBeard-e6dcfb3-002-remove_default_settings-0.3.patch rename to packages/3rdparty/download/SickBeard/patches/SickBeard-6cb5e76-002-remove_default_settings-0.3.patch From 53c9613e76fc6378f549420c63af3ac8c2e08c0a Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 9 Feb 2013 19:55:02 +0200 Subject: [PATCH 12/13] SABnzbd-Suite: update addon to 3.0.3 --- .../service/downloadmanager/SABnzbd-Suite/changelog.txt | 6 ++++++ packages/addons/service/downloadmanager/SABnzbd-Suite/meta | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt index b118d25df0..04c45a4564 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt @@ -1,3 +1,9 @@ +3.0.3 +- update to SABnzbd-0.7.11 +- update to CouchPotatoServer-811f35b +- update to SickBeard-6cb5e76 +- added option to restart the suite on suspend / resume + 3.0.2 - Fixed bug causing configobj to throw an exception with Couchpotato v2s config - corrected a bug causing most of the suite to crash on first launch in certain circumstances diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta b/packages/addons/service/downloadmanager/SABnzbd-Suite/meta index 5a50940073..c537ebaff3 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/meta @@ -20,7 +20,7 @@ PKG_NAME="SABnzbd-Suite" PKG_VERSION="3.0" -PKG_REV="2" +PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.openelec.tv" From 0991e2a7ab9022985070d8538295da05d1bdca24 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 9 Feb 2013 23:13:59 +0200 Subject: [PATCH 13/13] oscam: update to oscam-8334 --- packages/addons/service/softcam/oscam/changelog.txt | 3 +++ packages/addons/service/softcam/oscam/meta | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/softcam/oscam/changelog.txt b/packages/addons/service/softcam/oscam/changelog.txt index abc87ec26d..0501e20999 100644 --- a/packages/addons/service/softcam/oscam/changelog.txt +++ b/packages/addons/service/softcam/oscam/changelog.txt @@ -1,3 +1,6 @@ +3.0.6 +- update to oscam-8334 + 3.0.5 - update to oscam-8119 - use internal crypto functions diff --git a/packages/addons/service/softcam/oscam/meta b/packages/addons/service/softcam/oscam/meta index 505fce425d..02c9873cfb 100644 --- a/packages/addons/service/softcam/oscam/meta +++ b/packages/addons/service/softcam/oscam/meta @@ -20,8 +20,8 @@ ################################################################################ PKG_NAME="oscam" -PKG_VERSION="8119" -PKG_REV="5" +PKG_VERSION="8334" +PKG_REV="6" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.streamboard.tv/oscam/wiki"