From 0f40e257b60c62320486622ea8ef60e92752f3d5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 19 Aug 2013 00:58:59 +0200 Subject: [PATCH 01/13] avahi: change path to service configfiles Signed-off-by: Stephan Raue --- packages/network/avahi/init.d/53_avahi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/avahi/init.d/53_avahi b/packages/network/avahi/init.d/53_avahi index 1831782af0..8084b0d6a4 100644 --- a/packages/network/avahi/init.d/53_avahi +++ b/packages/network/avahi/init.d/53_avahi @@ -35,8 +35,8 @@ mkdir -p /var/run/avahi-daemon while true; do AVAHI_ENABLED=true - if [ -f $CONFIG_CACHE/service_avahi.conf ]; then - . $CONFIG_CACHE/service_avahi.conf + if [ -f $CONFIG_CACHE/services/avahi.conf ]; then + . $CONFIG_CACHE/serviceS/avahi.conf fi if [ "$AVAHI_ENABLED" == "true" ]; then wait_for_dbus From f15dbf49bdfeed79770bbc2667c7f3ab7c6ecbc6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 19 Aug 2013 00:59:10 +0200 Subject: [PATCH 02/13] bluez: change path to service configfiles Signed-off-by: Stephan Raue --- packages/network/bluez/init.d/54_bluez | 4 ++-- packages/network/bluez/init.d/55_obexd | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/network/bluez/init.d/54_bluez b/packages/network/bluez/init.d/54_bluez index b3887cb6b9..b429fb519d 100644 --- a/packages/network/bluez/init.d/54_bluez +++ b/packages/network/bluez/init.d/54_bluez @@ -33,8 +33,8 @@ fi BLUEZ_ENABLED=true - if [ -f $CONFIG_CACHE/service_bluez.conf ]; then - . $CONFIG_CACHE/service_bluez.conf + if [ -f $CONFIG_CACHE/services/bluez.conf ]; then + . $CONFIG_CACHE/services/bluez.conf fi if [ "$BLUEZ_ENABLED" == "true" ]; then diff --git a/packages/network/bluez/init.d/55_obexd b/packages/network/bluez/init.d/55_obexd index 7235b27ce5..06eb7fcec7 100644 --- a/packages/network/bluez/init.d/55_obexd +++ b/packages/network/bluez/init.d/55_obexd @@ -34,8 +34,8 @@ OBEXD_ENABLED=true OBEXD_ROOT=/storage/downloads - if [ -f $CONFIG_CACHE/service_bluez.conf ]; then - . $CONFIG_CACHE/service_bluez.conf + if [ -f $CONFIG_CACHE/services/bluez.conf ]; then + . $CONFIG_CACHE/services/bluez.conf fi if [ "$BLUEZ_ENABLED" == "true" -a "$OBEXD_ENABLED" == "true" ]; then From 5f5e8cf08c344271065351aa50eded4fe0f4d4e4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 19 Aug 2013 00:59:25 +0200 Subject: [PATCH 03/13] openssh: change path to service configfiles Signed-off-by: Stephan Raue --- packages/network/openssh/init.d/51_sshd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/openssh/init.d/51_sshd b/packages/network/openssh/init.d/51_sshd index a5dc2f9ce7..da76b423f1 100644 --- a/packages/network/openssh/init.d/51_sshd +++ b/packages/network/openssh/init.d/51_sshd @@ -27,8 +27,8 @@ . /etc/profile SSHD_START=false - if [ -f $CONFIG_CACHE/service_ssh.conf ]; then - . $CONFIG_CACHE/service_ssh.conf + if [ -f $CONFIG_CACHE/services/ssh.conf ]; then + . $CONFIG_CACHE/services/ssh.conf fi # Check if password authentication is disabled From f63140fce49ea08f13f6f830ef482f01de874ea2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 19 Aug 2013 00:59:39 +0200 Subject: [PATCH 04/13] samba: change path to service configfiles Signed-off-by: Stephan Raue --- packages/network/samba/scripts/52_samba | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/samba/scripts/52_samba b/packages/network/samba/scripts/52_samba index 1f844ecaff..6e473ed6fd 100644 --- a/packages/network/samba/scripts/52_samba +++ b/packages/network/samba/scripts/52_samba @@ -28,8 +28,8 @@ . /etc/profile SAMBA_ENABLED=true - if [ -f $CONFIG_CACHE/service_samba.conf ]; then - . $CONFIG_CACHE/service_samba.conf + if [ -f $CONFIG_CACHE/services/samba.conf ]; then + . $CONFIG_CACHE/services/samba.conf fi if [ "$SAMBA_ENABLED" = "true" ]; then From f255fbe7312654611393555f26f4fa0c393e5ff0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 19 Aug 2013 01:00:06 +0200 Subject: [PATCH 05/13] busybox: change path to service configfiles Signed-off-by: Stephan Raue --- packages/sysutils/busybox/init.d/05_syslogd | 4 ++-- packages/sysutils/busybox/scripts/09_crond | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/sysutils/busybox/init.d/05_syslogd b/packages/sysutils/busybox/init.d/05_syslogd index dcfd7e0e7b..86617fd93a 100644 --- a/packages/sysutils/busybox/init.d/05_syslogd +++ b/packages/sysutils/busybox/init.d/05_syslogd @@ -29,8 +29,8 @@ . /etc/profile SYSLOG_REMOTE=false - if [ -e $CONFIG_CACHE/service_syslog.conf ] ; then - . $CONFIG_CACHE/service_syslog.conf + if [ -e $CONFIG_CACHE/services/syslog.conf ] ; then + . $CONFIG_CACHE/services/syslog.conf fi SYSLOGD_OPTIONS="-L" diff --git a/packages/sysutils/busybox/scripts/09_crond b/packages/sysutils/busybox/scripts/09_crond index cd003d6210..ec4288518f 100644 --- a/packages/sysutils/busybox/scripts/09_crond +++ b/packages/sysutils/busybox/scripts/09_crond @@ -29,8 +29,8 @@ . /etc/profile CRON_ENABLED=true - if [ -f $CONFIG_CACHE/service_cron.conf ]; then - . $CONFIG_CACHE/service_cron.conf + if [ -f $CONFIG_CACHE/services/cron.conf ]; then + . $CONFIG_CACHE/services/cron.conf fi if [ "$CRON_ENABLED" == "true" ]; then From 45b0a5054ee7652802bfefedf30380afcd608367 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 19 Aug 2013 01:00:32 +0200 Subject: [PATCH 06/13] service.openelec.settings: add upstream patches Signed-off-by: Stephan Raue --- .../service.openelec.settings-folders.patch | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch diff --git a/packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch b/packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch new file mode 100644 index 0000000000..247d2ec510 --- /dev/null +++ b/packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch @@ -0,0 +1,72 @@ +From b0f33807f0dadf11d1b007204607d98d9f17d8f7 Mon Sep 17 00:00:00 2001 +From: lufi +Date: Sun, 18 Aug 2013 22:16:45 +0200 +Subject: [PATCH 1/2] Update defaults.py + +--- + defaults.py | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/defaults.py b/defaults.py +index 7a582de..16e78e8 100755 +--- a/defaults.py ++++ b/defaults.py +@@ -144,11 +144,11 @@ + + _services = \ + { +- "sshd" : ["sshd.service"], +- "avahi" : ["avahi-daemon.service"], +- "samba" : ["nmbd.service", "smbd.service"], +- "bluetooth" : ["bluetooth.service"], +- "obexd" : ["obex.service"], +- "syslog" : ["syslog.service"], +- "cron" : ["cron.service"], +- } +\ No newline at end of file ++ "sshd" : ["sshd.service"], ++ "avahi" : ["avahi-daemon.service"], ++ "samba" : ["nmbd.service", "smbd.service"], ++ "bluez" : ["bluetooth.service"], ++ "obexd" : ["obex.service"], ++ "syslog" : ["syslog.service"], ++ "cron" : ["cron.service"], ++ } +-- +1.8.1.6 + + +From 26d02eb4b2ca01e975a4c0b4c8a91a8010147cbf Mon Sep 17 00:00:00 2001 +From: lufi +Date: Sun, 18 Aug 2013 22:21:28 +0200 +Subject: [PATCH 2/2] change old service config files to .cache/services/ dir + +--- + oe.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/oe.py b/oe.py +index 7df2ba2..d3db4b4 100755 +--- a/oe.py ++++ b/oe.py +@@ -213,7 +213,7 @@ def set_service_option(service, option, value): + lines = [] + changed = False + +- conf_file_name = '%s/service_%s.conf' % (CONFIG_CACHE, service) ++ conf_file_name = '%s/services/%s.conf' % (CONFIG_CACHE, service) + + if os.path.isfile(conf_file_name): + with open(conf_file_name, "r") as conf_file: +@@ -239,7 +239,7 @@ def get_service_option(service, option, default=None): + conf_file_name = '' + + if not SYSTEMD: +- conf_file_name = '%s/service_%s.conf' % (CONFIG_CACHE, service) ++ conf_file_name = '%s/services/%s.conf' % (CONFIG_CACHE, service) + else: + if os.path.exists('%s/services/%s.conf' % (CONFIG_CACHE, service)): + conf_file_name = '%s/services/%s.conf' % (CONFIG_CACHE, service) +-- +1.8.1.6 + From 8b80e3d7149b0e106a6c43cc5df736b5d4135f91 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 19 Aug 2013 01:01:33 +0200 Subject: [PATCH 07/13] bcm2835-driver: reenable setup of framebuffer Signed-off-by: Stephan Raue --- packages/graphics/bcm2835-driver/profile.d/display.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/bcm2835-driver/profile.d/display.conf b/packages/graphics/bcm2835-driver/profile.d/display.conf index 56487e4d8f..ed0ab96f8d 100644 --- a/packages/graphics/bcm2835-driver/profile.d/display.conf +++ b/packages/graphics/bcm2835-driver/profile.d/display.conf @@ -28,5 +28,5 @@ # stub function wait_for_xorg () { echo 0 > /sys/class/vtconsole/vtcon1/bind - # fbset -g 1 1 1 1 32 + fbset -g 1 1 1 1 32 } From 645b62ea8a39dabbef7d899443d2772d7369dee8 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 19 Aug 2013 01:10:16 +0200 Subject: [PATCH 08/13] avahi: change path to service configfiles Signed-off-by: Stephan Raue --- packages/network/avahi/init.d/53_avahi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/avahi/init.d/53_avahi b/packages/network/avahi/init.d/53_avahi index 8084b0d6a4..6144abbcc1 100644 --- a/packages/network/avahi/init.d/53_avahi +++ b/packages/network/avahi/init.d/53_avahi @@ -36,7 +36,7 @@ while true; do AVAHI_ENABLED=true if [ -f $CONFIG_CACHE/services/avahi.conf ]; then - . $CONFIG_CACHE/serviceS/avahi.conf + . $CONFIG_CACHE/services/avahi.conf fi if [ "$AVAHI_ENABLED" == "true" ]; then wait_for_dbus From cf237932ea1ba096bd56c0455c8724099351876e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 19 Aug 2013 15:12:21 +0300 Subject: [PATCH 09/13] bluez: obexd: also load services/obexd.conf --- packages/network/bluez/init.d/55_obexd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/network/bluez/init.d/55_obexd b/packages/network/bluez/init.d/55_obexd index 06eb7fcec7..65df521839 100644 --- a/packages/network/bluez/init.d/55_obexd +++ b/packages/network/bluez/init.d/55_obexd @@ -37,6 +37,9 @@ if [ -f $CONFIG_CACHE/services/bluez.conf ]; then . $CONFIG_CACHE/services/bluez.conf fi + if [ -f $CONFIG_CACHE/services/obexd.conf ]; then + . $CONFIG_CACHE/services/obexd.conf + fi if [ "$BLUEZ_ENABLED" == "true" -a "$OBEXD_ENABLED" == "true" ]; then progress "Starting obexd" From faefbc216012449e30175f25c7be87ebf102d136 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 19 Aug 2013 16:11:04 +0300 Subject: [PATCH 10/13] connman: update to connman-8378438 --- packages/network/connman/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk index cef3ce9e0f..db06fcb3f6 100644 --- a/packages/network/connman/package.mk +++ b/packages/network/connman/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="connman" -PKG_VERSION="38c1662" +PKG_VERSION="8378438" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From d9be608012ca37dabf9e3897d3a76a3573aecaf8 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 19 Aug 2013 15:27:51 +0200 Subject: [PATCH 11/13] xbmc: update to xbmc-12.2-8e195d7 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/package.mk | 2 +- .../todo/xbmc-990.27-PR2232.patch.bk | 0 ...-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk | 0 .../xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk | 0 .../xbmc-321-texturepacker-hostflags-and-rework.patch | 0 ...bmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch | 0 .../xbmc-452-change_lcd_content-0.1.patch | 0 .../xbmc-453-add_openelec.tv_RSS_news-0.1.patch | 0 .../xbmc-990.00-remove-windowed-display-mode.patch | 0 .../xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch | 0 .../xbmc-995.11-enable-vpp-deinterlacing.patch | 0 .../xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch | 0 .../xbmc-995.13-vpp-fix-skipping.patch | 0 14 files changed, 2 insertions(+), 2 deletions(-) rename packages/mediacenter/xbmc/patches/{12.2-7da5ea4 => 12.2-8e195d7}/todo/xbmc-990.27-PR2232.patch.bk (100%) rename packages/mediacenter/xbmc/patches/{12.2-7da5ea4 => 12.2-8e195d7}/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk (100%) rename packages/mediacenter/xbmc/patches/{12.2-7da5ea4 => 12.2-8e195d7}/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk (100%) rename packages/mediacenter/xbmc/patches/{12.2-7da5ea4 => 12.2-8e195d7}/xbmc-321-texturepacker-hostflags-and-rework.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-7da5ea4 => 12.2-8e195d7}/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-7da5ea4 => 12.2-8e195d7}/xbmc-452-change_lcd_content-0.1.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-7da5ea4 => 12.2-8e195d7}/xbmc-453-add_openelec.tv_RSS_news-0.1.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-7da5ea4 => 12.2-8e195d7}/xbmc-990.00-remove-windowed-display-mode.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-7da5ea4 => 12.2-8e195d7}/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-7da5ea4 => 12.2-8e195d7}/xbmc-995.11-enable-vpp-deinterlacing.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-7da5ea4 => 12.2-8e195d7}/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch (100%) rename packages/mediacenter/xbmc/patches/{12.2-7da5ea4 => 12.2-8e195d7}/xbmc-995.13-vpp-fix-skipping.patch (100%) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 1d42292d66..f86e458a0b 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="12.2-7da5ea4" +PKG_VERSION="12.2-8e195d7" if [ "$XBMC" = "master" ]; then PKG_VERSION="13.alpha-df91888" elif [ "$XBMC" = "xbmc-aml" ]; then diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index f02f904917..267efd17a4 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="12.2-7da5ea4" +PKG_VERSION="12.2-8e195d7" if [ "$XBMC" = "master" ]; then PKG_VERSION="13.alpha-df91888" elif [ "$XBMC" = "xbmc-aml" ]; then diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/todo/xbmc-990.27-PR2232.patch.bk b/packages/mediacenter/xbmc/patches/12.2-8e195d7/todo/xbmc-990.27-PR2232.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/todo/xbmc-990.27-PR2232.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-8e195d7/todo/xbmc-990.27-PR2232.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk b/packages/mediacenter/xbmc/patches/12.2-8e195d7/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-8e195d7/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk b/packages/mediacenter/xbmc/patches/12.2-8e195d7/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-8e195d7/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-990.00-remove-windowed-display-mode.patch b/packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-990.00-remove-windowed-display-mode.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-990.00-remove-windowed-display-mode.patch rename to packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-990.00-remove-windowed-display-mode.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch b/packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch rename to packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-995.11-enable-vpp-deinterlacing.patch b/packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-995.11-enable-vpp-deinterlacing.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-995.11-enable-vpp-deinterlacing.patch rename to packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-995.11-enable-vpp-deinterlacing.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch b/packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch rename to packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-995.13-vpp-fix-skipping.patch b/packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-995.13-vpp-fix-skipping.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-995.13-vpp-fix-skipping.patch rename to packages/mediacenter/xbmc/patches/12.2-8e195d7/xbmc-995.13-vpp-fix-skipping.patch From 99c98ce632d0376c98d722e8c1ad2832486783ea Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 19 Aug 2013 15:28:33 +0200 Subject: [PATCH 12/13] service.openelec.settings: update upstream patch Signed-off-by: Stephan Raue --- .../service.openelec.settings-folders.patch | 54 ++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch b/packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch index 247d2ec510..0befb3a182 100644 --- a/packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch +++ b/packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch @@ -1,7 +1,7 @@ From b0f33807f0dadf11d1b007204607d98d9f17d8f7 Mon Sep 17 00:00:00 2001 From: lufi Date: Sun, 18 Aug 2013 22:16:45 +0200 -Subject: [PATCH 1/2] Update defaults.py +Subject: [PATCH 1/3] Update defaults.py --- defaults.py | 16 ++++++++-------- @@ -39,7 +39,7 @@ index 7a582de..16e78e8 100755 From 26d02eb4b2ca01e975a4c0b4c8a91a8010147cbf Mon Sep 17 00:00:00 2001 From: lufi Date: Sun, 18 Aug 2013 22:21:28 +0200 -Subject: [PATCH 2/2] change old service config files to .cache/services/ dir +Subject: [PATCH 2/3] change old service config files to .cache/services/ dir --- oe.py | 4 ++-- @@ -70,3 +70,53 @@ index 7df2ba2..d3db4b4 100755 -- 1.8.1.6 + +From adfcc15ae01cecc78a63613d2b46f08b8e7f6713 Mon Sep 17 00:00:00 2001 +From: lufi +Date: Mon, 19 Aug 2013 13:34:13 +0200 +Subject: [PATCH 3/3] Update services.py + +--- + resources/lib/modules/services.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/resources/lib/modules/services.py b/resources/lib/modules/services.py +index 9ec987b..d4d96a6 100755 +--- a/resources/lib/modules/services.py ++++ b/resources/lib/modules/services.py +@@ -399,12 +399,12 @@ def load_values(self): + self.struct['bluez']['settings']['enabled']['value'] = '0' + + if os.path.isfile(self.oe.dictModules['bluetooth'].OBEX_DAEMON): +- if self.oe.get_service_option('bluez', 'OBEXD_ENABLED', 'true') == 'true': ++ if self.oe.get_service_option('obexd', 'OBEXD_ENABLED', 'true') == 'true': + self.struct['bluez']['settings']['obex_enabled']['value'] = '1' + else: + self.struct['bluez']['settings']['obex_enabled']['value'] = '0' + +- tmpVal = self.oe.get_service_option('bluez', 'OBEXD_ROOT', ++ tmpVal = self.oe.get_service_option('obexd', 'OBEXD_ROOT', + self.oe.dictModules['bluetooth'].D_OBEXD_ROOT) + if not tmpVal is None: + self.struct['bluez']['settings']['obex_root']['value'] = tmpVal +@@ -946,14 +946,14 @@ def init_bluetooth(self, **kwargs): + if not self.oe.SYSTEMD: + if self.struct['bluez']['settings']['obex_enabled']['value'] == '0': + +- self.oe.set_service_option('bluez', ++ self.oe.set_service_option('obexd', + 'OBEXD_ENABLED', + 'false') + else: +- self.oe.set_service_option('bluez', ++ self.oe.set_service_option('obexd', + 'OBEXD_ENABLED', + 'true') +- self.oe.set_service_option('bluez', ++ self.oe.set_service_option('obexd', + 'OBEXD_ROOT', + self.struct['bluez']['settings' + ]['obex_root']['value']) +-- +1.8.1.6 + From 1166b8e59080d4769d72b423ee12d598b777b771 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 19 Aug 2013 15:31:53 +0200 Subject: [PATCH 13/13] xbmc: update advancedsettings.xml Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/config/advancedsettings.xml | 2 +- projects/ARCTIC_MC/xbmc/advancedsettings.xml | 2 +- projects/ATV/xbmc/advancedsettings.xml | 2 +- projects/Fusion/xbmc/advancedsettings.xml | 2 +- projects/RPi/xbmc/advancedsettings.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/mediacenter/xbmc/config/advancedsettings.xml b/packages/mediacenter/xbmc/config/advancedsettings.xml index 865b948b78..5024fd8baf 100644 --- a/packages/mediacenter/xbmc/config/advancedsettings.xml +++ b/packages/mediacenter/xbmc/config/advancedsettings.xml @@ -19,6 +19,6 @@ 30 - 4.0 + 4.0 diff --git a/projects/ARCTIC_MC/xbmc/advancedsettings.xml b/projects/ARCTIC_MC/xbmc/advancedsettings.xml index 00b8b641e5..6568c6735b 100644 --- a/projects/ARCTIC_MC/xbmc/advancedsettings.xml +++ b/projects/ARCTIC_MC/xbmc/advancedsettings.xml @@ -19,7 +19,7 @@ 30 - 4.0 + 4.0 diff --git a/projects/ATV/xbmc/advancedsettings.xml b/projects/ATV/xbmc/advancedsettings.xml index 4144f87606..27ce108942 100644 --- a/projects/ATV/xbmc/advancedsettings.xml +++ b/projects/ATV/xbmc/advancedsettings.xml @@ -21,7 +21,7 @@ 30 - 4.0 + 4.0 diff --git a/projects/Fusion/xbmc/advancedsettings.xml b/projects/Fusion/xbmc/advancedsettings.xml index 00b8b641e5..6568c6735b 100644 --- a/projects/Fusion/xbmc/advancedsettings.xml +++ b/projects/Fusion/xbmc/advancedsettings.xml @@ -19,7 +19,7 @@ 30 - 4.0 + 4.0 diff --git a/projects/RPi/xbmc/advancedsettings.xml b/projects/RPi/xbmc/advancedsettings.xml index 88feb05800..1bb69747c7 100644 --- a/projects/RPi/xbmc/advancedsettings.xml +++ b/projects/RPi/xbmc/advancedsettings.xml @@ -29,7 +29,7 @@ 30 - 4.0 + 4.0